merge of '86b0497d4fe52237e4f52c1f3b0086f931a8720f'

     and 'a9d5f0dcb0f1b73518569a304f263ac4f3e2819a'

15 files changed, 2241 insertions, 312 deletions

diff --git a/packages/dbus/dbus-native_1.0.3.bb b/packages/dbus/dbus-native_1.0.3.bb
index 0149ab374f..195557b35b 100644
--- a/packages/dbus/dbus-native_1.0.3.bb
+++ b/packages/dbus/dbus-native_1.0.3.bb
@@ -8,7 +8,7 @@ DEPENDS = "glib-2.0-native libxml2-native expat-native"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/dbus-${PV}"
 
 SRC_URI = "\
-  http://freedesktop.org/software/dbus/releases/dbus-${PV}.tar.gz \
+  http://freedesktop.org/software/dbus/releases/dbus/dbus-${PV}.tar.gz \
   file://cross.patch;patch=1 \
   file://tmpdir.patch;patch=1 \
   file://dbus-1.init \
diff --git a/packages/keymaps/files/tosa/keymap-2.6.map b/packages/keymaps/files/tosa/keymap-2.6.map
index b85d5616e5..f83e4bfe39 100644
--- a/packages/keymaps/files/tosa/keymap-2.6.map
+++ b/packages/keymaps/files/tosa/keymap-2.6.map
@@ -1,117 +1,297 @@
 # Default kernel keymap. This uses 7 modifier combinations.
 keymaps 0-2,4-5,8,12
-# Change the above line into
-#	keymaps 0-2,4-6,8,12
-# in case you want the entries
-#	altgr   control keycode  83 = Boot            
-#	altgr   control keycode 111 = Boot            
-# below.
 #
-keycode   1 =        
-keycode  14 = BackSpace
-	altgr keycode 14 = Delete
-keycode  15 = Tab
-	altgr keycode 65 = Caps_Lock
-keycode  16 = q
-	altgr keycode 16 = one
+keycode   1 = Escape           Escape          
+#	alt     keycode   1 = Meta_Escape     
+#keycode   2 = one              exclam          
+#	alt     keycode   2 = Meta_one        
+#keycode   3 = two              at               at              
+#	control	keycode   3 = nul             
+#	shift	control	keycode   3 = nul             
+#	alt	keycode   3 = Meta_two        
+#keycode   4 = three            numbersign      
+#	control keycode   4 = Escape          
+#	alt     keycode   4 = Meta_three      
+#keycode   5 = four             dollar           dollar          
+#	control keycode   5 = Control_backslash
+#	alt     keycode   5 = Meta_four       
+#keycode   6 = five             percent         
+#	control keycode   6 = Control_bracketright
+#	alt     keycode   6 = Meta_five       
+#keycode   7 = six              asciicircum     
+#	control keycode   7 = Control_asciicircum
+#	alt     keycode   7 = Meta_six        
+#keycode   8 = seven            ampersand        braceleft       
+#	control keycode   8 = Control_underscore
+#	alt     keycode   8 = Meta_seven      
+#keycode   9 = eight            asterisk         bracketleft     
+#	control keycode   9 = Delete          
+#	alt     keycode   9 = Meta_eight      
+#keycode  10 = nine             parenleft        bracketright    
+#	alt     keycode  10 = Meta_nine       
+#keycode  11 = zero             parenright       braceright      
+#	alt     keycode  11 = Meta_zero       
+#keycode  12 = minus            underscore       backslash       
+#	control	keycode  12 = Control_underscore
+#	shift	control	keycode  12 = Control_underscore
+#	alt	keycode  12 = Meta_minus      
+#keycode  13 = equal            plus            
+#	alt     keycode  13 = Meta_equal      
+keycode 14 = BackSpace		BackSpace	
+	altgr	keycode  14 = Delete
+#keycode  14 = Delete           Delete          
+#	control keycode  14 = BackSpace
+#	alt     keycode  14 = Meta_Delete     
+keycode  15 = Tab              Tab             
+	altgr     keycode  15 = Caps_Lock	
+keycode  16 = q               
+	altgr	keycode  16 = one
 keycode  17 = w               
-	altgr keycode 17 = two
+	altgr	keycode  17 = two
 keycode  18 = e
-	altgr keycode 18 = three
-keycode  19 = r          
-	altgr keycode 19 = four
+	altgr	keycode  18 = three
+#	altgr   keycode  18 = Hex_E   
+keycode  19 = r               
+	altgr	keycode  19 = four
 keycode  20 = t               
-	altgr keycode 20 = five
+	altgr	keycode  20 = five
 keycode  21 = y               
-	altgr keycode 21 = six
-keycode  22 = u      
-	altgr keycode 22 = seven
-keycode  23 = i           
-	altgr keycode 23 = eight
+	altgr	keycode  21 = six
+keycode  22 = u               
+	altgr	keycode  22 = seven
+keycode  23 = i               
+	altgr	keycode  23 = eight
 keycode  24 = o               
-	altgr keycode 24 = nine
+	altgr	keycode	 24 = nine
 keycode  25 = p               
-	altgr keycode 25 = zero
-keycode  26 = 
-keycode  27 =
+	altgr	keycode  25 = zero
+#keycode  26 = bracketleft      braceleft       
+#	control keycode  26 = Escape          
+#	alt     keycode  26 = Meta_bracketleft
+#keycode  27 = bracketright     braceright       asciitilde      
+#	control keycode  27 = Control_bracketright
+#	alt     keycode  27 = Meta_bracketright
 keycode  28 = Return          
-	altgr     keycode  28 = greater     
+	altgr	keycode  28 = greater
+#	alt     keycode  28 = Meta_Control_m  
 keycode  29 = Control         
 keycode  30 = a
-	altgr keycode 30 = exclam
+	altgr	keycode  30 = exclam
+#	altgr   keycode  30 = Hex_A
 keycode  31 = s               
-	altgr keycode 31 = at
+	altgr	keycode  31 = at
 keycode  32 = d
-	altgr keycode 32 = numbersign
+	altgr	keycode  32 = numbersign
+#	altgr   keycode  32 = Hex_D   
 keycode  33 = f
-	altgr keycode 33 = dollar
+	altgr	keycode  33 = dollar
+#	altgr   keycode  33 = Hex_F               
 keycode  34 = g               
-	altgr keycode 34 = percent
-keycode  35 = h         
-	altgr keycode 35 = underscore
-keycode  36 = j        
-	altgr keycode 36 = ampersand
-keycode  37 = k   
-    altgr keycode 37 = asterisk
-keycode  38 = l         
-	altgr keycode 38 = parenleft
-keycode  39 =  
-keycode  40 = apostrophe
-	altgr keycode 40 = asciitilde
-	shift keycode 40 = quotedbl
-keycode  41 =     
+	altgr	keycode  34 = percent
+keycode  35 = h               
+	altgr	keycode  35 = underscore
+keycode  36 = j               
+	altgr	keycode  36 = ampersand
+keycode  37 = k               
+	altgr	keycode  37 = asterisk
+keycode  38 = l               
+	altgr	keycode  38 = parenleft
+#keycode  39 = semicolon        colon           
+#	alt     keycode  39 = Meta_semicolon  
+keycode  40 = apostrophe       quotedbl        
+	altgr	keycode  40 = asciitilde
+#	control keycode  40 = Control_g       
+#	alt     keycode  40 = Meta_apostrophe 
+#keycode  41 = grave            asciitilde      
+#	control keycode  41 = nul             
+#	alt     keycode  41 = Meta_grave      
 keycode  42 = Shift           
-keycode  43 =  
+#keycode  43 = backslash        bar             
+#	control keycode  43 = Control_backslash
+#	alt     keycode  43 = Meta_backslash  
 keycode  44 = z               
+##	alt	keycode 44  = 
 keycode  45 = x               
+	altgr	keycode  45 = Control_x
 keycode  46 = c
+	altgr	keycode  46 = Control_c
+#	altgr   keycode  46 = Hex_C   
 keycode  47 = v               
+	altgr	keycode	 47 = Control_v
 keycode  48 = b
-	altgr keycode 48 = minus
+	altgr	keycode  48 = minus
+#	altgr   keycode  48 = Hex_B
 keycode  49 = n               
-	altgr keycode 49 = plus
+	altgr	keycode  49 = plus
 keycode  50 = m               
-	altgr keycode 50 = equal
-keycode  51 = comma
-	altgr keycode 51 = parenright
-	shift keycode 51 = semicolon
-keycode  52 = period           
-	shift keycode 52 = colon
-	altgr keycode 52 = less
-
-keycode  53 = slash
-	shift keycode 53 = question
-	altgr keycode 53 = Num_Lock
-
+	altgr	keycode  50 = equal
+keycode  51 = comma		semicolon
+	altgr	keycode  51 = parenright
+#keycode  51 = comma            less            
+#	alt     keycode  51 = Meta_comma      
+keycode  52 = period	colon
+	control keycode  52 = Compose         
+	altgr	keycode  52 = less
+#keycode  52 = period           greater         
+#	control keycode  52 = Compose         
+#	alt     keycode  52 = Meta_period     
+keycode  53 = slash            question        
+	altgr	keycode  53 = Num_Lock
+#	control keycode  53 = Delete          
+#	alt     keycode  53 = Meta_slash      
 keycode  54 = Shift           
-keycode  55 = 
-keycode  56 = Alt             
+#keycode  55 = KP_Multiply     
+#keycode  56 = Alt             
 keycode  57 = space            space           
-	control keycode  57 = nul   
-	altgr keycode 57 = bar
-keycode 59 = F9
-keycode 60 = F10
-keycode 61 = AltGr
-keycode 62 = Escape
-keycode 63 = space
-keycode 64 = Control
-keycode 65 = F15
-keycode 66 = F24
-keycode 67 = F12
-keycode 68 = F13
-keycode 79 = F15
-keycode 80 = F16
-keycode 82 = F17
-keycode 87 = Return
-keycode 88 = F11	          
-keycode 97 = Control  
-keycode 99 = F12       
+	altgr	keycode  57 = bar
+#	control keycode  57 = nul             
+#	alt     keycode  57 = Meta_space      
+#keycode  58 = Caps_Lock       
+#keycode  59 = F1               F11              Console_13      
+#	control keycode  59 = F1              
+#	alt     keycode  59 = Console_1       
+#	control alt     keycode  59 = Console_1       
+#keycode  60 = F2               F12              Console_14      
+#	control keycode  60 = F2              
+#	alt     keycode  60 = Console_2       
+#	control alt     keycode  60 = Console_2       
+#keycode  61 = F3               F13              Console_15      
+#	control keycode  61 = F3              
+#	alt     keycode  61 = Console_3       
+#	control alt     keycode  61 = Console_3       
+#keycode  62 = F4               F14              Console_16      
+#	control keycode  62 = F4              
+#	alt     keycode  62 = Console_4       
+#	control alt     keycode  62 = Console_4       
+#keycode  63 = F5               F15              Console_17      
+#	control keycode  63 = F5              
+#	alt     keycode  63 = Console_5       
+#	control alt     keycode  63 = Console_5       
+#keycode  64 = F6               F16              Console_18      
+#	control keycode  64 = F6              
+#	alt     keycode  64 = Console_6       
+#	control alt     keycode  64 = Console_6       
+#keycode  65 = F7               F17              Console_19      
+#	control keycode  65 = F7              
+#	alt     keycode  65 = Console_7       
+#	control alt     keycode  65 = Console_7       
+#keycode  66 = F8               F18              Console_20      
+#	control keycode  66 = F8              
+#	alt     keycode  66 = Console_8       
+#	control alt     keycode  66 = Console_8       
+#keycode  67 = F9               F19              Console_21      
+#	control keycode  67 = F9              
+#	alt     keycode  67 = Console_9       
+#	control alt     keycode  67 = Console_9       
+#keycode  68 = F10              F20              Console_22      
+#	control keycode  68 = F10             
+#	alt     keycode  68 = Console_10      
+#	control alt     keycode  68 = Console_10      
+#keycode  69 = Num_Lock
+#	shift   keycode  69 = Bare_Num_Lock
+#keycode  70 = Scroll_Lock      Show_Memory      Show_Registers  
+#	control keycode  70 = Show_State      
+#	alt     keycode  70 = Scroll_Lock     
+#keycode  71 = KP_7            
+#	alt     keycode  71 = Ascii_7         
+#	altgr   keycode  71 = Hex_7         
+#keycode  72 = KP_8            
+#	alt     keycode  72 = Ascii_8         
+#	altgr   keycode  72 = Hex_8         
+#keycode  73 = KP_9            
+#	alt     keycode  73 = Ascii_9         
+#	altgr   keycode  73 = Hex_9         
+#keycode  74 = KP_Subtract     
+#keycode  75 = KP_4            
+#	alt     keycode  75 = Ascii_4         
+#	altgr   keycode  75 = Hex_4         
+#keycode  76 = KP_5            
+#	alt     keycode  76 = Ascii_5         
+#	altgr   keycode  76 = Hex_5         
+#keycode  77 = KP_6            
+#	alt     keycode  77 = Ascii_6         
+#	altgr   keycode  77 = Hex_6         
+#keycode  78 = KP_Add          
+#keycode  79 = KP_1            
+#	alt     keycode  79 = Ascii_1         
+#	altgr   keycode  79 = Hex_1         
+#keycode  80 = KP_2            
+#	alt     keycode  80 = Ascii_2         
+#	altgr   keycode  80 = Hex_2         
+#keycode  81 = KP_3            
+#	alt     keycode  81 = Ascii_3         
+#	altgr   keycode  81 = Hex_3         
+#keycode  82 = KP_0            
+#	alt     keycode  82 = Ascii_0         
+#	altgr   keycode  82 = Hex_0         
+#keycode  83 = KP_Period       
+##	altgr   control keycode  83 = Boot            
+#	control alt     keycode  83 = Boot            
+#keycode  84 = Last_Console    
+#keycode  85 =
+#keycode  86 = less             greater          bar             
+#	alt     keycode  86 = Meta_less       
+#keycode  87 = F11              F11              Console_23      
+#	control keycode  87 = F11             
+#	alt     keycode  87 = Console_11      
+#	control alt     keycode  87 = Console_11      
+#keycode  88 = F12              F12              Console_24      
+#	control keycode  88 = F12             
+#	alt     keycode  88 = Console_12      
+#	control alt     keycode  88 = Console_12      
+#keycode  89 =
+#keycode  90 =
+keycode  91 = space
+#keycode  91 =
+keycode  92 = Return
+#keycode  92 =
+#keycode  93 =
+#keycode  94 =
+#keycode  95 =
+#keycode  96 = KP_Enter        
+#keycode  97 = Control         
+#keycode  98 = KP_Divide       
+#keycode  99 = Control_backslash
+#	control keycode  99 = Control_backslash
+#	alt     keycode  99 = Control_backslash
+keycode 100 = AltGr           
+#keycode 101 = Break           
+#keycode 102 = Find            
 keycode 103 = Up              
+	altgr	keycode  103 = Prior
+	shift   keycode  104 = Scroll_Backward 
+#keycode 104 = Prior           
+#	shift   keycode 104 = Scroll_Backward 
 keycode 105 = Left            
-	altgr     keycode 105 = Decr_Console
+	altgr	keycode  105 = Decr_Console
 keycode 106 = Right           
-	altgr     keycode 106 = Incr_Console
-keycode 108 = Down  
+	altgr	keycode  106 = Incr_Console
+#keycode 107 = Select          
+keycode 108 = Down            
+	altgr	keycode  108 = Next
+	shift   keycode  108 = Scroll_Forward  
+#keycode 109 = Next            
+#	shift   keycode 109 = Scroll_Forward  
+#keycode 110 = Insert          
+#keycode 111 = Remove          
+##	altgr   control keycode 111 = Boot            
+#	control alt     keycode 111 = Boot            
+#keycode 112 = Macro           
+#keycode 113 = F13             
+#keycode 114 = F14             
+#keycode 115 = Help            
+#keycode 116 = Do              
+#keycode 117 = F17             
+#keycode 118 = KP_MinPlus      
+#keycode 119 = Pause           
+#keycode 120 =
+#keycode 121 =
+#keycode 122 =
+#keycode 123 =
+#keycode 124 =
+#keycode 125 =
+#keycode 126 =
+#keycode 127 =
 string F1 = "\033[[A"
 string F2 = "\033[[B"
 string F3 = "\033[[C"
diff --git a/packages/keymaps/keymaps_1.0.bb b/packages/keymaps/keymaps_1.0.bb
index 00a215f948..bf60ce0448 100644
--- a/packages/keymaps/keymaps_1.0.bb
+++ b/packages/keymaps/keymaps_1.0.bb
@@ -3,7 +3,7 @@ SECTION = "base"
 RDEPENDS = "initscripts console-tools"
 LICENSE = "GPL"
 PACKAGE_ARCH = "${MACHINE}"
-PR = "r16"
+PR = "r17"
 
 inherit update-rc.d
 
diff --git a/packages/less/less_382.bb b/packages/less/less_382.bb
deleted file mode 100644
index f336a59ad6..0000000000
--- a/packages/less/less_382.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-DESCRIPTION = "Less is a program similar to more, i.e. a terminal \
-based program for viewing text files and the output from other \
-programs. Less offers many features beyond those that more does."
-HOMEPAGE = "http://www.greenwoodsoftware.com/"
-SECTION = "console/utils"
-LICENSE = "BSD"
-DEPENDS = "ncurses"
-PR = "r1"
-
-SRC_URI = "${GNU_MIRROR}/less/less-${PV}.tar.gz \
-           file://configure.patch;patch=1"
-
-inherit autotools update-alternatives
-
-do_install () {
-        oe_runmake 'bindir=${D}${bindir}' 'mandir=${D}${mandir}' install
-        mv ${D}${bindir}/less ${D}${bindir}/less.${PN}
-}
-
-ALTERNATIVE_NAME = "less"
-ALTERNATIVE_PATH = "less.${PN}"
-ALTERNATIVE_PRIORITY = "100"
diff --git a/packages/less/less_406.bb b/packages/less/less_418.bb
index c8ef2fc6e6..c19a41e63d 100644
--- a/packages/less/less_406.bb
+++ b/packages/less/less_418.bb
@@ -6,7 +6,7 @@ SECTION = "console/utils"
 LICENSE = "BSD"
 DEPENDS = "ncurses"
 
-SRC_URI = "http://www.greenwoodsoftware.com/less/less-406.tar.gz "
+SRC_URI = "${GNU_MIRROR}/less/less-${PV}.tar.gz "
 
 inherit autotools update-alternatives
 
diff --git a/packages/linux/linux-rp-2.6.24/defconfig-tosa b/packages/linux/linux-rp-2.6.24/defconfig-tosa
new file mode 100644
index 0000000000..34f0cc1210
--- /dev/null
+++ b/packages/linux/linux-rp-2.6.24/defconfig-tosa
@@ -0,0 +1,1728 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.24
+# Mon Feb 25 01:57:38 2008
+#
+CONFIG_ARM=y
+CONFIG_SYS_SUPPORTS_APM_EMULATION=y
+CONFIG_GENERIC_GPIO=y
+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_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_ARCH_MTD_XIP=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 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 is not set
+# CONFIG_RELAY is not set
+# CONFIG_BLK_DEV_INITRD is not set
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_SYSCTL=y
+CONFIG_HAVE_CLOCK_LIB=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 is not set
+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=m
+CONFIG_IOSCHED_DEADLINE=m
+CONFIG_IOSCHED_CFQ=m
+# CONFIG_DEFAULT_AS is not set
+# CONFIG_DEFAULT_DEADLINE is not set
+# CONFIG_DEFAULT_CFQ is not set
+CONFIG_DEFAULT_NOOP=y
+CONFIG_DEFAULT_IOSCHED="noop"
+
+#
+# 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 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_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=y
+# 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
+CONFIG_DMABOUNCE=y
+
+#
+# Intel PXA2xx/PXA3xx Implementations
+#
+# CONFIG_ARCH_LUBBOCK is not set
+# CONFIG_MACH_LOGICPD_PXA270 is not set
+# CONFIG_MACH_MAINSTONE is not set
+# CONFIG_ARCH_PXA_IDP is not set
+CONFIG_PXA_SHARPSL=y
+# CONFIG_MACH_TRIZEPS4 is not set
+# CONFIG_MACH_HX2750 is not set
+# CONFIG_MACH_EM_X270 is not set
+# CONFIG_MACH_ZYLONITE is not set
+# CONFIG_MACH_ARMCORE is not set
+CONFIG_PXA_SHARPSL_25x=y
+# CONFIG_PXA_SHARPSL_27x is not set
+# CONFIG_MACH_HTCUNIVERSAL is not set
+# CONFIG_MACH_POODLE is not set
+# CONFIG_MACH_CORGI is not set
+# CONFIG_MACH_SHEPHERD is not set
+# CONFIG_MACH_HUSKY is not set
+CONFIG_MACH_TOSA=y
+CONFIG_PXA25x=y
+CONFIG_PXA_SSP=y
+# CONFIG_PXA_KEYS is not set
+
+#
+# Boot options
+#
+
+#
+# Power management
+#
+
+#
+# Processor Type
+#
+CONFIG_CPU_32=y
+CONFIG_CPU_XSCALE=y
+CONFIG_CPU_32v5=y
+CONFIG_CPU_ABRT_EV5T=y
+CONFIG_CPU_CACHE_VIVT=y
+CONFIG_CPU_TLB_V4WBI=y
+CONFIG_CPU_CP15=y
+CONFIG_CPU_CP15_MMU=y
+
+#
+# Processor Features
+#
+CONFIG_ARM_THUMB=y
+# CONFIG_CPU_DCACHE_DISABLE is not set
+# CONFIG_OUTER_CACHE is not set
+# CONFIG_IWMMXT is not set
+CONFIG_XSCALE_PMU=y
+CONFIG_SHARP_PARAM=y
+CONFIG_SHARP_SCOOP=y
+
+#
+# Bus support
+#
+# CONFIG_PCI_SYSCALL is not set
+# CONFIG_ARCH_SUPPORTS_MSI is not set
+CONFIG_PCCARD=y
+# CONFIG_PCMCIA_DEBUG is not set
+CONFIG_PCMCIA=y
+CONFIG_PCMCIA_LOAD_CIS=y
+# CONFIG_PCMCIA_IOCTL is not set
+
+#
+# PC-card bridges
+#
+CONFIG_PCMCIA_PXA2XX=y
+
+#
+# Kernel Features
+#
+CONFIG_TICK_ONESHOT=y
+# CONFIG_NO_HZ is not set
+# CONFIG_HIGH_RES_TIMERS is not set
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+CONFIG_PREEMPT=y
+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=ttyS0,115200n8 console=tty1 noinitrd root=/dev/mtdblock2 rootfstype=jffs2   dyntick=enable debug"
+# CONFIG_XIP_KERNEL is not set
+CONFIG_KEXEC=y
+CONFIG_ATAGS_PROC=y
+CONFIG_CPU_FREQ_PXA25x=y
+
+#
+# CPU Frequency scaling
+#
+CONFIG_CPU_FREQ=y
+CONFIG_CPU_FREQ_TABLE=y
+# CONFIG_CPU_FREQ_DEBUG is not set
+CONFIG_CPU_FREQ_STAT=m
+# CONFIG_CPU_FREQ_STAT_DETAILS is not set
+CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
+CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
+CONFIG_CPU_FREQ_GOV_POWERSAVE=m
+CONFIG_CPU_FREQ_GOV_USERSPACE=m
+CONFIG_CPU_FREQ_GOV_ONDEMAND=m
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
+
+#
+# Floating point emulation
+#
+
+#
+# At least one emulation must be selected
+#
+# CONFIG_FPE_NWFPE is not set
+# CONFIG_FPE_FASTFPE is not set
+
+#
+# Userspace binary formats
+#
+CONFIG_BINFMT_ELF=y
+CONFIG_BINFMT_AOUT=m
+CONFIG_BINFMT_MISC=m
+
+#
+# Power management options
+#
+CONFIG_PM=y
+# CONFIG_PM_LEGACY is not set
+# CONFIG_PM_DEBUG is not set
+CONFIG_PM_SLEEP=y
+CONFIG_SUSPEND_UP_POSSIBLE=y
+CONFIG_SUSPEND=y
+CONFIG_APM_EMULATION=y
+
+#
+# Networking
+#
+CONFIG_NET=y
+
+#
+# Networking options
+#
+CONFIG_PACKET=m
+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_NET_KEY=m
+# 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 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=m
+CONFIG_INET_XFRM_MODE_TRANSPORT=m
+CONFIG_INET_XFRM_MODE_TUNNEL=m
+CONFIG_INET_XFRM_MODE_BEET=m
+# CONFIG_INET_LRO is not set
+CONFIG_INET_DIAG=m
+CONFIG_INET_TCP_DIAG=m
+# 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_NETWORK_SECMARK is not set
+CONFIG_NETFILTER=y
+# CONFIG_NETFILTER_DEBUG is not set
+
+#
+# Core Netfilter Configuration
+#
+# CONFIG_NETFILTER_NETLINK is not set
+# CONFIG_NF_CONNTRACK_ENABLED 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_TRACE 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_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_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_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_IPRANGE=m
+CONFIG_IP_NF_MATCH_TOS=m
+CONFIG_IP_NF_MATCH_RECENT=m
+CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_AH=m
+CONFIG_IP_NF_MATCH_TTL=m
+CONFIG_IP_NF_MATCH_OWNER=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_TOS=m
+CONFIG_IP_NF_TARGET_ECN=m
+CONFIG_IP_NF_TARGET_TTL=m
+CONFIG_IP_NF_RAW=m
+CONFIG_IP_NF_ARPTABLES=m
+CONFIG_IP_NF_ARPFILTER=m
+CONFIG_IP_NF_ARP_MANGLE=m
+
+#
+# IPv6: Netfilter Configuration (EXPERIMENTAL)
+#
+# CONFIG_IP6_NF_QUEUE is not set
+# CONFIG_IP6_NF_IPTABLES 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=m
+
+#
+# IrDA protocols
+#
+CONFIG_IRLAN=m
+CONFIG_IRNET=m
+CONFIG_IRCOMM=m
+# CONFIG_IRDA_ULTRA is not set
+
+#
+# IrDA options
+#
+# CONFIG_IRDA_CACHE_LAST_LSAP is not set
+# CONFIG_IRDA_FAST_RR is not set
+# CONFIG_IRDA_DEBUG is not set
+
+#
+# Infrared-port device drivers
+#
+
+#
+# SIR device drivers
+#
+# CONFIG_IRTTY_SIR is not set
+
+#
+# Dongle support
+#
+# CONFIG_KINGSUN_DONGLE is not set
+# CONFIG_KSDAZZLE_DONGLE is not set
+# CONFIG_KS959_DONGLE is not set
+
+#
+# Old SIR device drivers
+#
+# CONFIG_IRPORT_SIR is not set
+
+#
+# Old Serial dongle support
+#
+
+#
+# FIR device drivers
+#
+# CONFIG_USB_IRDA is not set
+# CONFIG_SIGMATEL_FIR is not set
+CONFIG_PXA_FICP=m
+# CONFIG_MCS_FIR is not set
+CONFIG_BT=m
+CONFIG_BT_L2CAP=m
+CONFIG_BT_SCO=m
+CONFIG_BT_RFCOMM=m
+CONFIG_BT_RFCOMM_TTY=y
+CONFIG_BT_BNEP=m
+CONFIG_BT_BNEP_MC_FILTER=y
+CONFIG_BT_BNEP_PROTO_FILTER=y
+CONFIG_BT_HIDP=m
+
+#
+# Bluetooth device drivers
+#
+CONFIG_BT_HCIUSB=m
+# CONFIG_BT_HCIUSB_SCO is not set
+# CONFIG_BT_HCIBTSDIO is not set
+CONFIG_BT_HCIUART=m
+CONFIG_BT_HCIUART_H4=y
+CONFIG_BT_HCIUART_BCSP=y
+# CONFIG_BT_HCIUART_LL is not set
+CONFIG_BT_HCIBCM203X=m
+CONFIG_BT_HCIBPA10X=m
+CONFIG_BT_HCIBFUSB=m
+CONFIG_BT_HCIDTL1=m
+CONFIG_BT_HCIBT3C=m
+CONFIG_BT_HCIBLUECARD=m
+CONFIG_BT_HCIBTUART=m
+CONFIG_BT_HCIVHCI=m
+# CONFIG_AF_RXRPC is not set
+
+#
+# Wireless
+#
+# CONFIG_CFG80211 is not set
+CONFIG_WIRELESS_EXT=y
+# CONFIG_MAC80211 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