keymaps: Sync with OE.dev

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@899 311d38ba-8fff-0310-9ca6-ca027cbcb966

7 files changed, 1127 insertions, 10 deletions

diff --git a/meta/packages/keymaps/files/h2200/keymap-2.6.map b/meta/packages/keymaps/files/h2200/keymap-2.6.map
new file mode 100644
index 0000000000..8b4c43fe0b
--- /dev/null
+++ b/meta/packages/keymaps/files/h2200/keymap-2.6.map
@@ -0,0 +1,17 @@
+# Kernel keymap for h2200 keys
+
+# Apps keys
+keycode  67 = F9
+keycode  68 = F10
+keycode  87 = F11
+keycode  88 = F12
+
+# Joypad
+keycode 103 = Up
+keycode 105 = Left
+keycode 106 = Right
+keycode 108 = Down
+keycode  28 = Return
+
+# Power key
+keycode 116 = F34
diff --git a/meta/packages/keymaps/files/jornada6xx/keymap-de.map b/meta/packages/keymaps/files/jornada6xx/keymap-de.map
new file mode 100644
index 0000000000..98083d2e58
--- /dev/null
+++ b/meta/packages/keymaps/files/jornada6xx/keymap-de.map
@@ -0,0 +1,597 @@
+keymaps 0-6,8-10,12
+keycode   1 = Escape           Escape          
+keycode   2 = one              exclam		bar          
+keycode   3 = two              quotedbl         twosuperior     
+keycode   4 = three            section          threesuperior   
+	control	keycode   4 = Escape          
+	alt	keycode   4 = Meta_three      
+	control	alt	keycode   4 = Meta_Escape     
+keycode   5 = four             dollar          
+	alt	keycode   5 = Meta_four       
+	shift	alt	keycode   5 = Meta_dollar     
+keycode   6 = five             percent         
+	alt	keycode   6 = Meta_five       
+	shift	alt	keycode   6 = Meta_percent    
+keycode   7 = six              ampersand       
+	control	keycode   7 = Control_asciicircum
+	alt	keycode   7 = Meta_six        
+	shift	alt	keycode   7 = Meta_ampersand  
+keycode   8 = seven            slash            braceleft       
+	alt	keycode   8 = Meta_seven      
+	shift	alt	keycode   8 = Meta_slash      
+	altgr	alt	keycode   8 = Meta_braceleft  
+keycode   9 = eight            parenleft        bracketleft     
+	alt	keycode   9 = Meta_eight      
+	shift	alt	keycode   9 = Meta_parenleft  
+	altgr	alt	keycode   9 = Meta_bracketleft
+keycode  10 = nine             parenright       bracketright    
+	altgr	control	keycode  10 = Control_bracketright
+	alt	keycode  10 = Meta_nine       
+	shift	alt	keycode  10 = Meta_parenright 
+	altgr	alt	keycode  10 = Meta_bracketright
+keycode  11 = zero             equal            braceright      
+	alt	keycode  11 = Meta_zero       
+	shift	alt	keycode  11 = Meta_equal      
+	altgr	alt	keycode  11 = Meta_braceright 
+keycode  12 = ssharp           question         backslash       
+	altgr	control	keycode  12 = Control_backslash
+	shift	alt	keycode  12 = Meta_question   
+	altgr	alt	keycode  12 = Meta_backslash  
+keycode  13 = apostrophe       grave           
+	alt	keycode  13 = 0x08b4          
+	shift	alt	keycode  13 = Meta_grave      
+keycode  14 = Delete           Delete          
+	alt	keycode  14 = Meta_Delete     
+	shift	alt	keycode  14 = Meta_Delete     
+keycode  15 = Tab              Meta_Tab        
+	alt	keycode  15 = Meta_Tab        
+keycode  16 = +q               +Q               at              
+	control	keycode  16 = Control_q       
+	shift	control	keycode  16 = Control_q       
+	altgr	control	keycode  16 = nul             
+	alt	keycode  16 = Meta_q          
+	shift	alt	keycode  16 = Meta_Q          
+	altgr	alt	keycode  16 = Meta_at         
+	control	alt	keycode  16 = Meta_Control_q  
+keycode  17 = +w              
+	shift	keycode  17 = +W              
+	shift	altgr	keycode  17 = VoidSymbol      
+	control	keycode  17 = Control_w       
+	shift	control	keycode  17 = Control_w       
+	altgr	control	keycode  17 = Control_w       
+	alt	keycode  17 = Meta_w          
+	shift	alt	keycode  17 = Meta_W          
+	altgr	alt	keycode  17 = Meta_w          
+	control	alt	keycode  17 = Meta_Control_w  
+keycode  18 = +e               +E               currency        
+	control	keycode  18 = Control_e       
+	shift	control	keycode  18 = Control_e       
+	altgr	control	keycode  18 = Control_e       
+	alt	keycode  18 = Meta_e          
+	shift	alt	keycode  18 = Meta_E          
+	altgr	alt	keycode  18 = Meta_e          
+	control	alt	keycode  18 = Meta_Control_e  
+keycode  19 = +r              
+	shift	keycode  19 = +R              
+	shift	altgr	keycode  19 = VoidSymbol      
+	control	keycode  19 = Control_r       
+	shift	control	keycode  19 = Control_r       
+	altgr	control	keycode  19 = Control_r       
+	alt	keycode  19 = Meta_r          
+	shift	alt	keycode  19 = Meta_R          
+	altgr	alt	keycode  19 = Meta_r          
+	control	alt	keycode  19 = Meta_Control_r  
+keycode  20 = +t              
+	shift	keycode  20 = +T              
+	shift	altgr	keycode  20 = VoidSymbol      
+	control	keycode  20 = Control_t       
+	shift	control	keycode  20 = Control_t       
+	altgr	control	keycode  20 = Control_t       
+	alt	keycode  20 = Meta_t          
+	shift	alt	keycode  20 = Meta_T          
+	altgr	alt	keycode  20 = Meta_t          
+	control	alt	keycode  20 = Meta_Control_t  
+keycode  21 = +z              
+	shift	keycode  21 = +Z              
+	shift	altgr	keycode  21 = VoidSymbol      
+	control	keycode  21 = Control_z       
+	shift	control	keycode  21 = Control_z       
+	altgr	control	keycode  21 = Control_z       
+	alt	keycode  21 = Meta_z          
+	shift	alt	keycode  21 = Meta_Z          
+	altgr	alt	keycode  21 = Meta_z          
+	control	alt	keycode  21 = Meta_Control_z  
+keycode  22 = +u              
+	shift	keycode  22 = +U              
+	shift	altgr	keycode  22 = VoidSymbol      
+	control	keycode  22 = Control_u       
+	shift	control	keycode  22 = Control_u       
+	altgr	control	keycode  22 = Control_u       
+	alt	keycode  22 = Meta_u          
+	shift	alt	keycode  22 = Meta_U          
+	altgr	alt	keycode  22 = Meta_u          
+	control	alt	keycode  22 = Meta_Control_u  
+keycode  23 = +i              
+	shift	keycode  23 = +I              
+	shift	altgr	keycode  23 = VoidSymbol      
+	control	keycode  23 = Tab             
+	shift	control	keycode  23 = Tab             
+	altgr	control	keycode  23 = Tab             
+	alt	keycode  23 = Meta_i          
+	shift	alt	keycode  23 = Meta_I          
+	altgr	alt	keycode  23 = Meta_i          
+	control	alt	keycode  23 = Meta_Tab        
+keycode  24 = +o              
+	shift	keycode  24 = +O              
+	shift	altgr	keycode  24 = VoidSymbol      
+	control	keycode  24 = Control_o       
+	shift	control	keycode  24 = Control_o       
+	altgr	control	keycode  24 = Control_o       
+	alt	keycode  24 = Meta_o          
+	shift	alt	keycode  24 = Meta_O          
+	altgr	alt	keycode  24 = Meta_o          
+	control	alt	keycode  24 = Meta_Control_o  
+keycode  25 = +p              
+	shift	keycode  25 = +P              
+	shift	altgr	keycode  25 = VoidSymbol      
+	control	keycode  25 = Control_p       
+	shift	control	keycode  25 = Control_p       
+	altgr	control	keycode  25 = Control_p       
+	alt	keycode  25 = Meta_p          
+	shift	alt	keycode  25 = Meta_P          
+	altgr	alt	keycode  25 = Meta_p          
+	control	alt	keycode  25 = Meta_Control_p  
+keycode  26 = +udiaeresis      +Udiaeresis     
+keycode  27 = plus             asterisk         asciitilde      
+	alt	keycode  27 = Meta_plus       
+	shift	alt	keycode  27 = Meta_asterisk   
+keycode  28 = Return          
+	shift	altgr	keycode  28 = VoidSymbol      
+	alt	keycode  28 = Meta_Control_m  
+keycode  29 = Control        
+	shift	keycode  29 = Compose         
+	shift	altgr	keycode  29 = VoidSymbol      
+keycode  30 = +a              
+	shift	keycode  30 = +A              
+	shift	altgr	keycode  30 = VoidSymbol      
+	control	keycode  30 = Control_a       
+	shift	control	keycode  30 = Control_a       
+	altgr	control	keycode  30 = Control_a       
+	alt	keycode  30 = Meta_a          
+	shift	alt	keycode  30 = Meta_A          
+	altgr	alt	keycode  30 = Meta_a          
+	control	alt	keycode  30 = Meta_Control_a  
+keycode  31 = +s              
+	shift	keycode  31 = +S              
+	shift	altgr	keycode  31 = VoidSymbol      
+	control	keycode  31 = Control_s       
+	shift	control	keycode  31 = Control_s       
+	altgr	control	keycode  31 = Control_s       
+	alt	keycode  31 = Meta_s          
+	shift	alt	keycode  31 = Meta_S          
+	altgr	alt	keycode  31 = Meta_s          
+	control	alt	keycode  31 = Meta_Control_s  
+keycode  32 = +d              
+	shift	keycode  32 = +D              
+	shift	altgr	keycode  32 = VoidSymbol      
+	control	keycode  32 = Control_d       
+	shift	control	keycode  32 = Control_d       
+	altgr	control	keycode  32 = Control_d       
+	alt	keycode  32 = Meta_d          
+	shift	alt	keycode  32 = Meta_D          
+	altgr	alt	keycode  32 = Meta_d          
+	control	alt	keycode  32 = Meta_Control_d  
+keycode  33 = +f              
+	shift	keycode  33 = +F              
+	shift	altgr	keycode  33 = VoidSymbol      
+	control	keycode  33 = Control_f       
+	shift	control	keycode  33 = Control_f       
+	altgr	control	keycode  33 = Control_f       
+	alt	keycode  33 = Meta_f          
+	shift	alt	keycode  33 = Meta_F          
+	altgr	alt	keycode  33 = Meta_f          
+	control	alt	keycode  33 = Meta_Control_f  
+keycode  34 = +g              
+	shift	keycode  34 = +G              
+	shift	altgr	keycode  34 = VoidSymbol      
+	control	keycode  34 = Control_g       
+	shift	control	keycode  34 = Control_g       
+	altgr	control	keycode  34 = Control_g       
+	alt	keycode  34 = Meta_g          
+	shift	alt	keycode  34 = Meta_G          
+	altgr	alt	keycode  34 = Meta_g          
+	control	alt	keycode  34 = Meta_Control_g  
+keycode  35 = +h              
+	shift	keycode  35 = +H              
+	shift	altgr	keycode  35 = VoidSymbol      
+	control	keycode  35 = BackSpace       
+	shift	control	keycode  35 = BackSpace       
+	altgr	control	keycode  35 = BackSpace       
+	alt	keycode  35 = Meta_h          
+	shift	alt	keycode  35 = Meta_H          
+	altgr	alt	keycode  35 = Meta_h          
+	control	alt	keycode  35 = Meta_BackSpace  
+keycode  36 = +j              
+	shift	keycode  36 = +J              
+	shift	altgr	keycode  36 = VoidSymbol      
+	control	keycode  36 = Linefeed        
+	shift	control	keycode  36 = Linefeed        
+	altgr	control	keycode  36 = Linefeed        
+	alt	keycode  36 = Meta_j          
+	shift	alt	keycode  36 = Meta_J          
+	altgr	alt	keycode  36 = Meta_j          
+	control	alt	keycode  36 = Meta_Linefeed   
+keycode  37 = +k              
+	shift	keycode  37 = +K              
+	shift	altgr	keycode  37 = VoidSymbol      
+	control	keycode  37 = Control_k       
+	shift	control	keycode  37 = Control_k       
+	altgr	control	keycode  37 = Control_k       
+	alt	keycode  37 = Meta_k          
+	shift	alt	keycode  37 = Meta_K          
+	altgr	alt	keycode  37 = Meta_k          
+	control	alt	keycode  37 = Meta_Control_k  
+keycode  38 = +l              
+	shift	keycode  38 = +L              
+	shift	altgr	keycode  38 = VoidSymbol      
+	control	keycode  38 = Control_l       
+	shift	control	keycode  38 = Control_l       
+	altgr	control	keycode  38 = Control_l       
+	alt	keycode  38 = Meta_l          
+	shift	alt	keycode  38 = Meta_L          
+	altgr	alt	keycode  38 = Meta_l          
+	control	alt	keycode  38 = Meta_Control_l  
+keycode  39 = +odiaeresis      +Odiaeresis     
+keycode  40 = +adiaeresis      +Adiaeresis     
+keycode  41 = F11		F23      
+	control	keycode  41 = Control_asciicircum
+	control	alt	keycode  41 = Meta_Control_asciicircum
+keycode  42 = Shift		Shift		Caps_Lock           
+	shift	altgr	keycode  42 = VoidSymbol      
+	control	keycode  42 = Compose         
+keycode  43 = numbersign       apostrophe      
+	alt	keycode  43 = Meta_numbersign 
+	shift	alt	keycode  43 = Meta_apostrophe 
+keycode  44 = +y		+Y		less              
+	shift	altgr	keycode  44 = VoidSymbol      
+	control	keycode  44 = Control_y       
+	shift	control	keycode  44 = Control_y       
+	altgr	control	keycode  44 = Control_y       
+	alt	keycode  44 = Meta_y          
+	shift	alt	keycode  44 = Meta_Y          
+	altgr	alt	keycode  44 = Meta_y          
+	control	alt	keycode  44 = Meta_Control_y  
+keycode  45 = +x		+X		greater              
+	shift	altgr	keycode  45 = VoidSymbol      
+	control	keycode  45 = Control_x       
+	shift	control	keycode  45 = Control_x       
+	altgr	control	keycode  45 = Control_x       
+	alt	keycode  45 = Meta_x          
+	shift	alt	keycode  45 = Meta_X          
+	altgr	alt	keycode  45 = Meta_x          
+	control	alt	keycode  45 = Meta_Control_x  
+keycode  46 = +c               +C               cent            
+	control	keycode  46 = Control_c       
+	shift	control	keycode  46 = Control_c       
+	altgr	control	keycode  46 = Control_c       
+	alt	keycode  46 = Meta_c          
+	shift	alt	keycode  46 = Meta_C          
+	altgr	alt	keycode  46 = Meta_c          
+	control	alt	keycode  46 = Meta_Control_c  
+keycode  47 = +v              
+	shift	keycode  47 = +V              
+	shift	altgr	keycode  47 = VoidSymbol      
+	control	keycode  47 = Control_v       
+	shift	control	keycode  47 = Control_v       
+	altgr	control	keycode  47 = Control_v       
+	alt	keycode  47 = Meta_v          
+	shift	alt	keycode  47 = Meta_V          
+	altgr	alt	keycode  47 = Meta_v          
+	control	alt	keycode  47 = Meta_Control_v  
+keycode  48 = +b              
+	shift	keycode  48 = +B              
+	shift	altgr	keycode  48 = VoidSymbol      
+	control	keycode  48 = Control_b       
+	shift	control	keycode  48 = Control_b       
+	altgr	control	keycode  48 = Control_b       
+	alt	keycode  48 = Meta_b          
+	shift	alt	keycode  48 = Meta_B          
+	altgr	alt	keycode  48 = Meta_b          
+	control	alt	keycode  48 = Meta_Control_b  
+keycode  49 = +n              
+	shift	keycode  49 = +N              
+	shift	altgr	keycode  49 = VoidSymbol      
+	control	keycode  49 = Control_n       
+	shift	control	keycode  49 = Control_n       
+	altgr	control	keycode  49 = Control_n       
+	alt	keycode  49 = Meta_n          
+	shift	alt	keycode  49 = Meta_N          
+	altgr	alt	keycode  49 = Meta_n          
+	control	alt	keycode  49 = Meta_Control_n  
+keycode  50 = +m               +M               mu              
+	control	keycode  50 = Control_m       
+	shift	control	keycode  50 = Control_m       
+	altgr	control	keycode  50 = Control_m       
+	alt	keycode  50 = Meta_m          
+	shift	alt	keycode  50 = Meta_M          
+	altgr	alt	keycode  50 = Meta_m          
+	control	alt	keycode  50 = Meta_Control_m  
+keycode  51 = comma            semicolon       
+	alt	keycode  51 = Meta_comma      
+	shift	alt	keycode  51 = Meta_semicolon  
+keycode  52 = period           colon           
+	alt	keycode  52 = Meta_period     
+	shift	alt	keycode  52 = Meta_colon      
+keycode  53 = minus            underscore       Meta_minus      
+	shift	control	keycode  53 = Control_underscore
+	alt	keycode  53 = Meta_minus      
+	shift	alt	keycode  53 = Meta_underscore 
+keycode  54 = Shift           
+	shift	altgr	keycode  54 = VoidSymbol      
+	control	keycode  54 = Compose         
+keycode  56 = Alt             
+	shift	altgr	keycode  56 = VoidSymbol      
+keycode  57 = space            space            Meta_space      
+	control	keycode  57 = nul             
+	alt	keycode  57 = Meta_space      
+	shift	alt	keycode  57 = Meta_space      
+	control	alt	keycode  57 = Meta_nul        
+keycode  58 = F9       
+	shift	altgr	keycode  58 = VoidSymbol      
+keycode  59 = F1               F13              Console_13      
+	control	keycode  59 = F25             
+	alt	keycode  59 = Console_1       
+	control	alt	keycode  59 = Console_1       
+keycode  60 = F2               F14              Console_14      
+	control	keycode  60 = F26             
+	alt	keycode  60 = Console_2       
+	control	alt	keycode  60 = Console_2       
+keycode  61 = F3               F15              Console_15      
+	control	keycode  61 = F27             
+	alt	keycode  61 = Console_3       
+	control	alt	keycode  61 = Console_3       
+keycode  62 = F4               F16              Console_16      
+	control	keycode  62 = F28             
+	alt	keycode  62 = Console_4       
+	control	alt	keycode  62 = Console_4       
+keycode  63 = F5               F17              Console_17      
+	control	keycode  63 = F29             
+	alt	keycode  63 = Console_5       
+	control	alt	keycode  63 = Console_5       
+keycode  64 = F6               F18              Console_18      
+	control	keycode  64 = F30             
+	alt	keycode  64 = Console_6       
+	control	alt	keycode  64 = Console_6       
+keycode  65 = F7               F19              Console_19      
+	control	keycode  65 = F31             
+	alt	keycode  65 = Console_7       
+	control	alt	keycode  65 = Console_7       
+keycode  66 = F8               F20              Console_20      
+	control	keycode  66 = F32             
+	alt	keycode  66 = Console_8       
+	control	alt	keycode  66 = Console_8       
+keycode  72 = Up
+	alt	keycode  72 = Prior           
+	shift	alt	keycode  72 = Scroll_Backward      
+keycode  75 = KP_4            
+	altgr	keycode  75 = Hex_4           
+	shift	altgr	keycode  75 = VoidSymbol      
+	alt	keycode  75 = Find         
+keycode  77 = KP_6            
+	altgr	keycode  77 = Hex_6           
+	shift	altgr	keycode  77 = VoidSymbol      
+	alt	keycode  77 = Select         
+keycode  80 = KP_2            
+	altgr	keycode  80 = Hex_2           
+	shift	altgr	keycode  80 = VoidSymbol      
+	alt	keycode  80 = Next         
+keycode  83 = Remove        
+	alt	keycode 83 = Insert
+	shift	altgr	keycode  83 = VoidSymbol      
+	altgr	control	keycode  83 = Boot            
+	control	alt	keycode  83 = Boot            
+keycode  91 = Insert
+keycode 112 = F10		F22           
+	shift	altgr	keycode 112 = VoidSymbol      
+	altgr	control	keycode 112 = VoidSymbol      
+	shift	alt	keycode 112 = VoidSymbol      
+	altgr	alt	keycode 112 = VoidSymbol      
+keycode 115 = AltGr            
+	shift	altgr	keycode 115 = VoidSymbol      
+	altgr	control	keycode 115 = VoidSymbol      
+	shift	alt	keycode 115 = VoidSymbol      
+	altgr	alt	keycode 115 = VoidSymbol      
+keycode 123 = asciicircum      degree
+string F1 = "\033[[A"
+string F2 = "\033[[B"
+string F3 = "\033[[C"
+string F4 = "\033[[D"
+string F5 = "\033[[E"
+string F6 = "\033[17~"
+string F7 = "\033[18~"
+string F8 = "\033[19~"
+string F9 = "\033[20~"
+string F10 = "\033[21~"
+string F11 = "\033[23~"
+string F12 = "\033[24~"
+string F13 = "\033[25~"
+string F14 = "\033[26~"
+string F15 = "\033[28~"
+string F16 = "\033[29~"
+string F17 = "\033[31~"
+string F18 = "\033[32~"
+string F19 = "\033[33~"
+string F20 = "\033[34~"
+string Find = "\033[1~"
+string Insert = "\033[2~"
+string Remove = "\033[3~"
+string Select = "\033[4~"
+string Prior = "\033[5~"
+string Next = "\033[6~"
+string Macro = "\033[M"
+string Pause = "\033[P"
+compose '`' 'A' to '�'
+compose '`' 'a' to '�'
+compose '\'' 'A' to '�'
+compose '\'' 'a' to '�'
+compose '^' 'A' to '�'
+compose '^' 'a' to '�'
+compose '~' 'A' to '�'
+compose '~' 'a' to '�'
+compose '"' 'A' to '�'
+compose '"' 'a' to '�'
+compose '-' 'a' to '�'
+compose '-' 'A' to '�'
+compose 'O' 'A' to '�'
+compose 'o' 'a' to '�'
+compose '0' 'A' to '�'
+compose '0' 'a' to '�'
+compose 'A' 'A' to '�'
+compose 'a' 'a' to '�'
+compose '�' 'A' to '�'
+compose '�' 'a' to '�'
+compose 'A' 'E' to '�'
+compose 'a' 'e' to '�'
+compose ',' 'C' to '�'
+compose ',' 'c' to '�'
+compose '^' 'C' to '�'
+compose '^' 'c' to '�'
+compose '`' 'E' to '�'
+compose '`' 'e' to '�'
+compose '\'' 'E' to '�'
+compose '\'' 'e' to '�'
+compose '^' 'E' to '�'
+compose '^' 'e' to '�'
+compose '"' 'E' to '�'
+compose '"' 'e' to '�'
+compose '`' 'I' to '�'
+compose '`' 'i' to '�'
+compose '\'' 'I' to '�'
+compose '\'' 'i' to '�'
+compose '^' 'I' to '�'
+compose '^' 'i' to '�'
+compose '"' 'I' to '�'
+compose '"' 'i' to '�'
+compose '-' 'D' to '�'
+compose '-' 'd' to '�'
+compose '^' 'D' to '�'
+compose '^' 'd' to '�'
+compose '~' 'N' to '�'
+compose '~' 'n' to '�'
+compose '^' 'N' to '�'
+compose '^' 'n' to '�'
+compose '`' 'O' to '�'
+compose '`' 'o' to '�'
+compose '\'' 'O' to '�'
+compose '\'' 'o' to '�'
+compose '^' 'O' to '�'
+compose '^' 'o' to '�'
+compose '~' 'O' to '�'
+compose '~' 'o' to '�'
+compose '"' 'O' to '�'
+compose '"' 'o' to '�'
+compose '/' 'O' to '�'
+compose '/' 'o' to '�'
+compose '-' 'o' to '�'
+compose '-' 'O' to '�'
+compose '`' 'U' to '�'
+compose '`' 'u' to '�'
+compose '\'' 'U' to '�'
+compose '\'' 'u' to '�'
+compose '^' 'U' to '�'
+compose '^' 'u' to '�'
+compose '"' 'U' to '�'
+compose '"' 'u' to '�'
+compose '\'' 'Y' to '�'
+compose '\'' 'y' to '�'
+compose 'T' 'H' to '�'
+compose 't' 'h' to '�'
+compose 's' 's' to '�'
+compose '"' 'y' to '�'
+compose 's' 'z' to '�'
+compose 'n' 'n' to '�'
+compose 'n' 'h' to '�'
+compose 'N' 'Y' to '�'
+compose 'N' 'N' to '�'
+compose 'N' 'H' to '�'
+compose 'N' 'y' to '�'
+compose 'N' 'n' to '�'
+compose 'N' 'h' to '�'
+compose '-' 'L' to '�'
+compose '<' '<' to '�'
+compose '>' '>' to '�'
+compose '?' '?' to '�'
+compose '^' '?' to '�'
+compose '!' '!' to '�'
+compose '^' '!' to '�'
+compose '^' '1' to '�'
+compose '^' '2' to '�'
+compose '^' '3' to '�'
+compose '+' '-' to '�'
+compose 'c' '=' to '�'
+compose 'c' '/' to '�'
+compose '/' 'c' to '�'
+compose '-' 'c' to '�'
+compose '-' 'C' to '�'
+compose '|' 'c' to '�'
+compose '|' 'C' to '�'
+compose 'L' '=' to '�'
+compose '-' 'L' to '�'
+compose '-' 'l' to '�'
+compose '^' '*' to '�'
+compose '^' 'x' to '�'
+compose 'x' 'x' to '�'
+compose '^' '.' to '�'
+compose '.' '.' to '�'
+compose '^' '/' to '�'
+compose '^' ':' to '�'
+compose '-' ':' to '�'
+compose ':' '-' to '�'
+compose 'Y' '=' to '�'
+compose '=' 'Y' to '�'
+compose '-' 'Y' to '�'
+compose '-' 'l' to '�'
+compose '(' 'c' to '�'
+compose '"' 'c' to '�'
+compose 'O' 'C' to '�'
+compose '(' 'C' to '�'
+compose 'C' ')' to '�'
+compose '-' 'a' to '�'
+compose '-' 'A' to '�'
+compose '-' 'o' to '�'
+compose '-' 'O' to '�'
+compose '(' 'r' to '�'
+compose '"' 'r' to '�'
+compose 'O' 'R' to '�'
+compose '(' 'R' to '�'
+compose 'R' ')' to '�'
+compose 'm' 'u' to '�'
+compose 'P' 'P' to '�'
+compose '1' '4' to '�'
+compose '1' '2' to '�'
+compose '3' '4' to '�'
+compose 'e' '=' to '�'
+compose '-' 'e' to '�'
+compose '-' 'E' to '�'
+compose '=' 'E' to '�'
+compose 'v' 'S' to '�'
+compose '^' 'S' to '�'
+compose 'v' 's' to '�'
+compose '^' 's' to '�'
+compose 'v' 'Z' to '�'
+compose '^' 'Z' to '�'
+compose 'v' 'z' to '�'
+compose '^' 'z' to '�'
+compose 'O' 'E' to '�'
+compose 'O' 'e' to '�'
+compose 'o' 'e' to '�'
+compose '"' 'Y' to '�'
+compose 'i' 'j' to '�'
+compose 'I' 'J' to '�'
+compose '|' 's' to '$'
+compose '|' 'S' to '$'
+compose 'S' 'S' to '�'
+compose '=' 'C' to '�'
+compose 'C' '=' to '�'
+compose 'o' 'x' to '�'
+compose 'x' 'o' to '�'
diff --git a/meta/packages/keymaps/files/jornada6xx/keymap-sp.map b/meta/packages/keymaps/files/jornada6xx/keymap-sp.map
new file mode 100644
index 0000000000..ba05387743
--- /dev/null
+++ b/meta/packages/keymaps/files/jornada6xx/keymap-sp.map
@@ -0,0 +1,222 @@
+# <ES.Keymap> for JLime
+# 
+# By Pau Rodriguez-Estivill
+# <20060708>
+
+strings as usual
+
+keycode   1 = Escape
+keycode   2 = one              
+          shift keycode 2 = exclam
+          AltGr keycode 2 = 0246
+keycode   3 = two             
+          Shift keycode 3 = quotedbl
+          AltGr keycode 3 = 0247
+keycode   4 = three            
+          shift keycode 4 = numbersign
+keycode   5 = four             
+          shift keycode 5 = dollar
+          AltGr keycode 5 = asciitilde
+keycode   6 = five             
+          shift keycode 6 = percent
+keycode   7 = six              
+          shift keycode 7 = ampersand
+keycode   8 = seven            
+          shift keycode 8 = slash
+keycode   9 = eight            
+          shift keycode 9 = parenleft
+keycode  10 = nine             
+         shift keycode 10 = parenright
+keycode  11 = zero             
+         shift keycode 11 = equal
+keycode  12 = apostrophe
+         shift keycode 12 = question
+         AltGr keycode 12 = backslash
+keycode  13 = 0250           
+         shift keycode 13 = 0255
+keycode  14 = Delete
+keycode  15 = Tab              
+keycode  16 = +q               +Q               
+         AltGr keycode 16 = at
+keycode  17 = +w              
+	shift	keycode  17 = +W              
+keycode  18 = +e               +E              
+         AltGr keycode 18 = currency
+keycode  19 = +r              
+	shift	keycode  19 = +R              
+keycode  20 = +t              
+	shift	keycode  20 = +T              
+keycode  21 = +y              
+	shift	keycode  21 = +Y
+keycode  22 = +u              
+	shift	keycode  22 = +U              
+keycode  23 = +i              
+	shift	keycode  23 = +I              
+keycode  24 = +o              
+	shift	keycode  24 = +O              
+keycode  25 = +p              
+	shift	keycode  25 = +P              
+keycode  26 = dead_acute
+        shift   keycode  26 = dead_diaeresis
+keycode  27 = plus             asterisk         asciitilde      
+keycode  28 = Return          
+keycode  29 = Control
+         AltGr keycode 29 = Num_Lock
+keycode  30 = +a              
+	shift	keycode  30 = +A              
+keycode  31 = +s              
+	shift	keycode  31 = +S              
+keycode  32 = +d              
+	shift	keycode  32 = +D              
+keycode  33 = +f              
+	shift	keycode  33 = +F              
+keycode  34 = +g              
+	shift	keycode  34 = +G              
+keycode  35 = +h              
+	shift	keycode  35 = +H              
+keycode  36 = +j              
+	shift	keycode  36 = +J              
+keycode  37 = +k              
+	shift	keycode  37 = +K              
+keycode  38 = +l              
+	shift	keycode  38 = +L              
+keycode  39 = +0244
+         shift keycode 39 = +0245
+keycode  40 = braceleft          
+         shift keycode 40 = bracketleft
+         AltGr keycode 40 = dead_circumflex         
+keycode  41 = F11
+         alt    keycode 41 = Console_11      
+         shift  keycode 41 = F12      
+         shift alt    keycode 41 = Console_12      
+keycode  42 = Shift         
+         AltGr keycode 42 = Caps_Lock         
+keycode  43 = braceright      
+         shift keycode 43 = bracketright
+         AltGr keycode 43 = dead_grave         
+keycode  44 = +z		+Z		              
+         AltGr keycode 44 = less         
+keycode  45 = +x		+X		              
+         AltGr keycode 45 = greater         
+keycode  46 = +c                +C                          
+         AltGr keycode 46 = 0247         
+         shift AltGr keycode 46 = 0246         
+keycode  47 = +v              
+	shift	keycode  47 = +V              
+keycode  48 = +b              
+	shift	keycode  48 = +B              
+keycode  49 = +n              
+	shift	keycode  49 = +N              
+keycode  50 = +m               +M               mu              
+keycode  51 = comma            
+	 shift   keycode  51 = semicolon
+keycode  52 = period          
+         shift keycode 52 = colon           
+keycode  53 = minus            underscore       Meta_minus      
+keycode  54 = Shift
+keycode  56 = Alt             
+keycode  57 = space            space            Meta_space      
+keycode  58 = F9       
+ 	 alt	keycode 58 = Console_9       
+keycode  59 = F1      
+keycode  60 = F2      
+keycode  61 = F3     
+ 	 alt	keycode 61 = Console_3       
+keycode  62 = F4      
+ 	 alt	keycode 62 = Console_4       
+keycode  63 = F5
+ 	 alt	keycode 63 = Console_5       
+keycode  64 = F6  
+ 	 alt	keycode 64 = Console_6       
+keycode  65 = F7               
+         alt    keycode 65 = Console_7      
+keycode  66 = F8  
+         alt    keycode 66 = Console_8      
+keycode  72 = Up
+         alt    keycode 72 = PageUp
+         shift alt    keycode 72 = Scroll_Backward
+keycode  75 = Left            
+         alt    keycode  75 = Home           
+keycode  77 = Right            
+         alt    keycode  77 = End            
+keycode  80 = Down    
+        alt     keycode 80 = PageDown    
+	shift alt keycode 80 = Scroll_Forward
+keycode  83 = Remove        
+	alt	keycode 83 = Insert
+keycode  91 = Insert
+keycode 112 = F10
+         alt    keycode 112 = Console_10      
+keycode 115 = AltGr
+keycode 123 = bar 
+        shift           keycode 123 = 0372        
+        AltGr           keycode 123 = +0252
+! compose for cp 850
+compose '`' 'A' to '�'
+compose '`' 'a' to '�'
+compose '\'' 'A' to '�'
+compose '\'' 'a' to '�'
+compose '^' 'A' to '�'
+compose '^' 'a' to '�'
+compose '~' 'A' to '�'
+compose '~' 'a' to '�'
+compose '"' 'A' to '�'
+compose '"' 'a' to '�'
+compose 'O' 'A' to '�'
+compose 'o' 'a' to '�'
+compose '0' 'A' to '�'
+compose '0' 'a' to '�'
+compose 'A' 'A' to '�'
+compose 'a' 'a' to '�'
+compose 'A' 'E' to '�'
+compose 'a' 'e' to '�'
+compose ',' 'C' to '�'
+compose ',' 'c' to '�'
+compose '`' 'E' to '�'
+compose '`' 'e' to '�'
+compose '\'' 'E' to '�'
+compose '\'' 'e' to '�'
+compose '^' 'E' to '�'
+compose '^' 'e' to '�'
+compose '"' 'E' to '�'
+compose '"' 'e' to '�'
+compose '`' 'I' to '�'
+compose '`' 'i' to '�'
+compose '\'' 'I' to '�'
+compose '\'' 'i' to '�'
+compose '^' 'I' to '�'
+compose '^' 'i' to '�'
+compose '"' 'I' to '�'
+compose '"' 'i' to '�'
+compose '-' 'D' to '�'
+compose '-' 'd' to '�'
+compose '~' 'N' to '�'
+compose '~' 'n' to '�'
+compose '`' 'O' to '�'
+compose '`' 'o' to '�'
+compose '\'' 'O' to '�'
+compose '\'' 'o' to '�'
+compose '^' 'O' to '�'
+compose '^' 'o' to '�'
+compose '~' 'O' to '�'
+compose '~' 'o' to '�'
+compose '"' 'O' to '�'
+compose '"' 'o' to '�'
+compose '/' 'O' to '�'
+compose '/' 'o' to '�'
+compose '`' 'U' to '�'
+compose '`' 'u' to '�'
+compose '\'' 'U' to '�'
+compose '\'' 'u' to '�'
+compose '^' 'U' to '�'
+compose '^' 'u' to '�'
+compose '"' 'U' to '�'
+compose '"' 'u' to '�'
+compose '\'' 'Y' to '�'
+compose '\'' 'y' to '�'
+compose 'T' 'H' to '�'
+compose 't' 'h' to '�'
+compose 's' 's' to '�'
+compose '"' 'y' to '�'
+compose 's' 'z' to '�'
+compose 'i' 'j' to '�'
diff --git a/meta/packages/keymaps/files/jornada6xx/keymap-uk.map b/meta/packages/keymaps/files/jornada6xx/keymap-uk.map
new file mode 100644
index 0000000000..4f511c8847
--- /dev/null
+++ b/meta/packages/keymaps/files/jornada6xx/keymap-uk.map
@@ -0,0 +1,278 @@
+# English keymap for Jornada 6xx devices.
+#
+# Created by Tibor Zenis ( zenis <at> fmph.uniba.sk )
+# (Lightly) Modified by Alex Palestras ( B_Linuz <at> yahoo.com )
+# plain, shift, altgr,  ctrl, shift + ctrl,  alt,  ctrl + alt
+
+keymaps 0-2,4-5,8,12
+keycode   1 = Escape           Escape          
+	alt	keycode   1 = Meta_Escape     
+keycode   2 = one              exclam		asciitilde
+	alt	keycode   2 = Meta_one
+keycode   3 = two              at		grave
+	alt	keycode   3 = Meta_two
+keycode   4 = three            numbersign      
+	alt	keycode   4 = Meta_three      
+	altgr	keycode   4 = pound
+keycode   5 = four             dollar
+	control	keycode   5 = Control_backslash
+	alt	keycode   5 = Meta_four       
+	altgr	keycode   5 = currency
+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 = KP_7      
+keycode   9 = eight            asterisk         bracketleft
+	control	keycode   9 = Delete
+	alt	keycode   9 = KP_8      
+keycode  10 = nine             parenleft        bracketright    
+	alt	keycode  10 = KP_9       
+keycode  11 = zero             parenright       braceright      
+	alt	keycode  11 = KP_Divide       
+keycode  12 = minus            underscore       backslash
+	control	keycode  11 = Control_underscore
+	shift control	keycode  11 = Control_underscore
+	alt	keycode  11 = Meta_minus
+keycode  13 = equal            plus            
+	alt	keycode  13 = Meta_equal      
+keycode  14 = Delete           Delete          
+	control	keycode  14 = BackSpace       
+	alt	keycode  14 = Meta_Delete     
+keycode  15 = Tab              Tab             
+	alt	keycode  15 = Meta_Tab        
+keycode  16 = q               
+keycode  17 = w               
+keycode  18 = e
+	Shift	keycode  18 = E
+keycode  19 = r               
+keycode  20 = t               
+keycode  21 = y               
+	alt	keycode  21 = KP_4
+keycode  22 = u               
+	alt	keycode  22 = KP_5
+keycode  23 = i               
+	alt	keycode  23 = KP_6
+keycode  24 = o
+	alt	keycode  24 = KP_Multiply
+keycode  25 = p             
+		AltGr keycode 25 = braceleft  
+keycode  26 = backslash	bar
+		AltGr keycode 26 = braceright 
+keycode  28 = Return          
+	alt	keycode  28 = Meta_Control_m  
+keycode  29 = Control         
+	altgr	keycode  29 = Num_Lock
+keycode  30 = a
+keycode  31 = s               
+keycode  32 = d
+keycode  33 = f
+keycode  34 = g               
+keycode  35 = h               
+	alt	keycode  35 = KP_1
+keycode  36 = j               
+	alt	keycode  36 = KP_2
+keycode  37 = k               
+	alt	keycode  37 = KP_3
+keycode  38 = l               
+	alt	keycode  38 = KP_Subtract
+keycode  39 = semicolon        colon           bracketleft
+	alt	keycode  39 = Meta_semicolon
+keycode  40 = apostrophe       quotedbl        bracketright
+	control	keycode  40 = Control_g       
+	alt	keycode  40 = Meta_apostrophe
+keycode  41 = F11             
+	shift	keycode  41 = F21
+	altgr	keycode  41 = Console_23      
+	alt	keycode  41 = Console_11      
+	control	alt	keycode  41 = Console_11      
+keycode  42 = Shift           
+	altgr	keycode  42 = Caps_Lock
+keycode  44 = z               
+keycode  45 = x               
+keycode  46 = c
+keycode  47 = v               
+keycode  48 = b
+keycode  49 = n               
+	alt	keycode  49 = KP_0
+keycode  50 = m               
+	alt	keycode  50 = KP_Comma
+keycode  51 = comma            less            
+	alt	keycode  51 = KP_Period      
+keycode  52 = period           greater         
+	control	keycode  52 = Compose         
+	alt	keycode  52 = KP_Add     
+keycode  54 = Shift 
+keycode  56 = Alt             
+keycode  57 = space            space           
+	alt	keycode  57 = Meta_space      
+keycode  58 = F9              
+	shift	keycode  58 = F19             
+	altgr	keycode  58 = Console_21      
+	alt	keycode  58 = Console_9       
+	control	alt	keycode  58 = Console_9       
+keycode  59 = F1              
+	altgr	keycode  59 = Console_13      
+	alt	keycode  59 = Console_1       
+	control	alt	keycode  59 = Console_1 
+keycode  60 = F2              
+	shift	keycode  60 = F12             
+	altgr	keycode  60 = Console_14      
+	alt	keycode  60 = Console_2       
+	control	alt	keycode  60 = Console_2       
+keycode  61 = F3              
+	shift	keycode  61 = F13             
+	altgr	keycode  61 = Console_15      
+	alt	keycode  61 = Console_3       
+	control	alt	keycode  61 = Console_3       
+keycode  62 = F4              
+	shift	keycode  62 = F14             
+	altgr	keycode  62 = Console_16      
+	alt	keycode  62 = Console_4       
+	control	alt	keycode  62 = Console_4       
+keycode  63 = F5              
+	shift	keycode  63 = F15             
+	altgr	keycode  63 = Console_17      
+	alt	keycode  63 = Console_5       
+	control	alt	keycode  63 = Console_5       
+keycode  64 = F6              
+	shift	keycode  64 = F16             
+	altgr	keycode  64 = Console_18      
+	alt	keycode  64 = Console_6       
+	control	alt	keycode  64 = Console_6       
+keycode  65 = F7              
+	shift	keycode  65 = F17             
+	altgr	keycode  65 = Console_19      
+	alt	keycode  65 = Console_7       
+	control	alt	keycode  65 = Console_7       
+keycode  66 = F8              
+	shift	keycode  66 = F18             
+	altgr	keycode  66 = Console_20      
+	alt	keycode  66 = Console_8       
+	control	alt	keycode  66 = Console_8       
+keycode  72 = Up
+	shift	keycode  72 = Scroll_Backward           
+	altgr	keycode  72 = Scroll_Backward           
+	alt	keycode  72 = Prior 
+keycode  75 = Left
+	altgr	keycode  75 = Decr_Console
+	alt	keycode  75 = Find      
+keycode  77 = Right
+	altgr	keycode  77 = Incr_Console
+	alt	keycode  77 = Select         
+keycode  80 = Down
+	shift	keycode  80 = Scroll_Forward
+	altgr	keycode  80 = Scroll_Forward
+	alt	keycode  80 = Next         
+keycode  83 = Remove	Remove		Meta_Delete
+	alt	keycode  83 = Meta_Delete            
+keycode 112 = F10             
+	shift	keycode 112 = F20             
+	altgr	keycode 112 = Console_22      
+	alt	keycode 112 = Console_10      
+	control	alt	keycode 112 = Console_10      
+keycode 115 = slash	question        
+	control	keycode  115 = Delete          
+	alt	keycode  115 = Meta_slash      
+keycode 123 = AltGr
+keycode 219 = Insert
+string F1 = "\033[[A"
+string F2 = "\033[[B"
+string F3 = "\033[[C"
+string F4 = "\033[[D"
+string F5 = "\033[[E"
+string F6 = "\033[17~"
+string F7 = "\033[18~"
+string F8 = "\033[19~"
+string F9 = "\033[20~"
+string F10 = "\033[21~"
+string F11 = "\033[23~"
+string F12 = "\033[24~"
+string F13 = "\033[25~"
+string F14 = "\033[26~"
+string F15 = "\033[28~"
+string F16 = "\033[29~"
+string F17 = "\033[31~"
+string F18 = "\033[32~"
+string F19 = "\033[33~"
+string F20 = "\033[34~"
+string Find = "\033[1~"
+string Insert = "\033[2~"
+string Remove = "\033[3~"
+string Select = "\033[4~"
+string Prior = "\033[5~"
+string Next = "\033[6~"
+string Macro = "\033[M"
+string Pause = "\033[P"
+compose '`' 'A' to '�'
+compose '`' 'a' to '�'
+compose '\'' 'A' to '�'
+compose '\'' 'a' to '�'
+compose '^' 'A' to '�'
+compose '^' 'a' to '�'
+compose '~' 'A' to '�'
+compose '~' 'a' to '�'
+compose '"' 'A' to '�'
+compose '"' 'a' to '�'
+compose 'O' 'A' to '�'
+compose 'o' 'a' to '�'
+compose '0' 'A' to '�'
+compose '0' 'a' to '�'
+compose 'A' 'A' to '�'
+compose 'a' 'a' to '�'
+compose 'A' 'E' to '�'
+compose 'a' 'e' to '�'
+compose ',' 'C' to '�'
+compose ',' 'c' to '�'
+compose '`' 'E' to '�'
+compose '`' 'e' to '�'
+compose '\'' 'E' to '�'
+compose '\'' 'e' to '�'
+compose '^' 'E' to '�'
+compose '^' 'e' to '�'
+compose '"' 'E' to '�'
+compose '"' 'e' to '�'
+compose '`' 'I' to '�'
+compose '`' 'i' to '�'
+compose '\'' 'I' to '�'
+compose '\'' 'i' to '�'
+compose '^' 'I' to '�'
+compose '^' 'i' to '�'
+compose '"' 'I' to '�'
+compose '"' 'i' to '�'
+compose '-' 'D' to '�'
+compose '-' 'd' to '�'
+compose '~' 'N' to '�'
+compose '~' 'n' to '�'
+compose '`' 'O' to '�'
+compose '`' 'o' to '�'
+compose '\'' 'O' to '�'
+compose '\'' 'o' to '�'
+compose '^' 'O' to '�'
+compose '^' 'o' to '�'
+compose '~' 'O' to '�'
+compose '~' 'o' to '�'
+compose '"' 'O' to '�'
+compose '"' 'o' to '�'
+compose '/' 'O' to '�'
+compose '/' 'o' to '�'
+compose '`' 'U' to '�'
+compose '`' 'u' to '�'
+compose '\'' 'U' to '�'
+compose '\'' 'u' to '�'
+compose '^' 'U' to '�'
+compose '^' 'u' to '�'
+compose '"' 'U' to '�'
+compose '"' 'u' to '�'
+compose '\'' 'Y' to '�'
+compose '\'' 'y' to '�'
+compose 'T' 'H' to '�'
+compose 't' 'h' to '�'
+compose 's' 's' to '�'
+compose '"' 'y' to '�'
+compose 's' 'z' to '�'
+compose 'i' 'j' to '�'
diff --git a/meta/packages/keymaps/files/poodle/keymap-2.6.map b/meta/packages/keymaps/files/poodle/keymap-2.6.map
index 68533bb93c..a39b886f5d 100644
--- a/meta/packages/keymaps/files/poodle/keymap-2.6.map
+++ b/meta/packages/keymaps/files/poodle/keymap-2.6.map
@@ -3,9 +3,9 @@ keymaps 0-2,4,8,12
 # 	      Default 		Shift 		AltGr 		Control 	Alt 		Ctrl+Alt 	
 keycode  29 = SControl	# Calendar	
 keycode  60 = SAlt	# Address
-keycode  63 = Return		
+keycode  63 = space	#Select
 keycode  68 = F13 	# Mail
-keycode  87 = Return		
+keycode  87 = F33	#OK	
 keycode  88 = F11 	# Menu
 keycode 102 = F12	# Home
 keycode 103 = Up		Up		Prior
@@ -73,6 +73,7 @@ string F17 = "\033[31~"
 string F18 = "\033[32~"
 string F19 = "\033[33~"
 string F20 = "\033[34~"
+string F33 = "\033[49~"
 string Find = "\033[1~"
 string Insert = "\033[2~"
 string Remove = "\033[3~"
diff --git a/meta/packages/keymaps/files/tosa/keymap-2.6.map b/meta/packages/keymaps/files/tosa/keymap-2.6.map
index ac43471326..b85d5616e5 100644
--- a/meta/packages/keymaps/files/tosa/keymap-2.6.map
+++ b/meta/packages/keymaps/files/tosa/keymap-2.6.map
@@ -63,7 +63,6 @@ keycode  41 =
 keycode  42 = Shift           
 keycode  43 =  
 keycode  44 = z               
-	altgr keycode 44 = bar
 keycode  45 = x               
 keycode  46 = c
 keycode  47 = v               
@@ -89,15 +88,16 @@ keycode  55 =
 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 = Return
-keycode 64 = Escape
-keycode 65 = Down
-keycode 66 = Up
-keycode 67 = Control
+keycode 63 = space
+keycode 64 = Control
+keycode 65 = F15
+keycode 66 = F24
+keycode 67 = F12
 keycode 68 = F13
 keycode 79 = F15
 keycode 80 = F16
diff --git a/meta/packages/keymaps/keymaps_1.0.bb b/meta/packages/keymaps/keymaps_1.0.bb
index 4a81acdc79..4c9edbcf4c 100644
--- a/meta/packages/keymaps/keymaps_1.0.bb
+++ b/meta/packages/keymaps/keymaps_1.0.bb
@@ -3,7 +3,7 @@ SECTION = "base"
 RDEPENDS = "initscripts console-tools"
 LICENSE = "GPL"
 PACKAGE_ARCH = "${MACHINE}"
-PR = "r6"
+PR = "r11"
 
 inherit update-rc.d
 
@@ -15,6 +15,8 @@ SRC_URI_append_akita        = " file://keymap-*.map"
 SRC_URI_append_spitz        = " file://keymap-*.map"
 SRC_URI_append_collie       = " file://keymap-*.map"
 SRC_URI_append_poodle       = " file://keymap-*.map"
+SRC_URI_append_jornada6xx   = " file://keymap-*.map"
+SRC_URI_append_h2200        = " file://keymap-*.map"
 
 INITSCRIPT_NAME = "keymap"
 INITSCRIPT_PARAMS = "start 01 S ."
@@ -24,7 +26,7 @@ do_install () {
     install -m 0755 ${WORKDIR}/keymap ${D}${sysconfdir}/init.d/
 
     case ${MACHINE} in
-        c7x0 | tosa | spitz | akita | collie | poodle )
+        c7x0 | tosa | spitz | akita | borzoi | collie | poodle | jornada6xx | h2200)
             install -m 0644 ${WORKDIR}/keymap-*.map	${D}${sysconfdir}
             ;;
         *)