merge of 0b32c3262ef809324fd2b1cf3daffb33589fe68c

     and 7bffbf2364668b2cd3e8ca978561a2cf01152db1

11 files changed, 686 insertions, 166 deletions

diff --git a/conf/distro/jlime-donkey.conf b/conf/distro/jlime-donkey.conf
index 923953420a..c37dee2666 100644
--- a/conf/distro/jlime-donkey.conf
+++ b/conf/distro/jlime-donkey.conf
@@ -11,6 +11,9 @@ export FEED_URLS_jlime = "donkey##http://www.jlime.com/downloads/releases/donkey
 # No uniroot
 PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap"
 
+# Lets set a few more terminals
+SYSVINIT_ENABLED_GETTYS = "4"
+
 #<>
 #<> We will set CVS DATE when things are known to work.
 #<>
@@ -75,9 +78,9 @@ TARGET_OS = "linux"
 #<>                                            
 #<>
 BOOTSTRAP_EXTRA_RDEPENDS += "pcmciautils ncurses nano wireless-tools console-tools coreutils udev \
-                             e2tools e2fsprogs kernel-modules"
+                             e2tools e2fsprogs kernel-modules spectrum-fw keymaps"
 BOOTSTRAP_EXTRA_DEPENDS  += "pcmciautils ncurses nano wireless-tools console-tools coreutils udev \
-                             e2tools e2fsprogs kernel-modules"
+                             e2tools e2fsprogs kernel-modules spectrum-fw keymaps"
 
 #<>
 #<>What Qte, libqte.. versions should we use.
diff --git a/conf/distro/openzaurus-unstable.conf b/conf/distro/openzaurus-unstable.conf
index 344fb80a89..ebbf84b37e 100644
--- a/conf/distro/openzaurus-unstable.conf
+++ b/conf/distro/openzaurus-unstable.conf
@@ -32,6 +32,7 @@ SRCDATE ?= "20060514"
 
 ASSUME_PROVIDED += "virtual/arm-linux-gcc-2.95"
 PREFERRED_PROVIDER_hostap-conf = "hostap-conf"
+PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap"
 
 KERNEL_CONSOLE = "ttyS0"
 #DEBUG_OPTIMIZATION = "-O -g3"
diff --git a/conf/distro/preferred-opie-cvs-versions.inc b/conf/distro/preferred-opie-cvs-versions.inc
index 0068ad3937..93b068ee65 100644
--- a/conf/distro/preferred-opie-cvs-versions.inc
+++ b/conf/distro/preferred-opie-cvs-versions.inc
@@ -10,7 +10,7 @@ PALMTOP_USE_MULTITHREADED_QT ?= "yes"
 #
 PREFERRED_PROVIDER_virtual/libqte2 ?= '${@base_conditional("PALMTOP_USE_MULTITHREADED_QT", "yes", "qte-mt", "qte", d)}'
 PREFERRED_PROVIDER_virtual/libqpe1 ?= "libqpe-opie"
-PREFERRED_VERSIION_qte-mt ?= "${QTE_VERSION}"
+PREFERRED_VERSION_qte-mt ?= "${QTE_VERSION}"
 PREFERRED_VERSION_qte ?= "${QTE_VERSION}"
 SRCDATE_libopie2 ?= "${OPIE_VERSION}"
 SRCDATE_libopieobex0 ?= "${OPIE_VERSION}"
diff --git a/packages/keymaps/keymaps_1.0.bb b/packages/keymaps/keymaps_1.0.bb
index 0c247a0563..8fa272124e 100644
--- a/packages/keymaps/keymaps_1.0.bb
+++ b/packages/keymaps/keymaps_1.0.bb
@@ -16,6 +16,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"
+
 
 INITSCRIPT_NAME = "keymap"
 INITSCRIPT_PARAMS = "start 00 S ."
@@ -25,7 +27,7 @@ do_install () {
     install -m 0755 ${WORKDIR}/keymap ${D}${sysconfdir}/init.d/
 
     case ${MACHINE} in
-        c7x0 | tosa | spitz | akita | borzoi | collie | poodle )
+        c7x0 | tosa | spitz | akita | borzoi | collie | poodle | jornada6xx)
             install -m 0644 ${WORKDIR}/keymap-*.map	${D}${sysconfdir}
             ;;
         *)
diff --git a/packages/linux/handhelds-pxa-2.6_cvs.bb b/packages/linux/handhelds-pxa-2.6_cvs.bb
index 1581a444b6..ef42191005 100644
--- a/packages/linux/handhelds-pxa-2.6_cvs.bb
+++ b/packages/linux/handhelds-pxa-2.6_cvs.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "handhelds.org Linux kernel for PXA based devices."
 MAINTAINER = "Greg Gilbert <greg@treke.net>"
 LICENSE = "GPL"
 PV = "${K_MAJOR}.${K_MINOR}.${K_MICRO}-hh${HHV}+cvs${SRCDATE}"
-PR = "r3"
+PR = "r0"
 #
 COMPATIBLE_HOST = "arm.*-linux"
 COMPATIBLE_MACHINE = '(h3900|h2200|ipaq-pxa270)'
@@ -25,7 +25,7 @@ ALLOW_EMPTY_ipaq_pxa270 = 1
 K_MAJOR = "2"
 K_MINOR = "6"
 K_MICRO = "16"
-HHV     = "0"
+HHV     = "4"
 #
 
 KERNEL_PRIORITY = "${@'%d' % (int(bb.data.getVar('K_MAJOR',d,1)) * 100000000 + int(bb.data.getVar('K_MINOR',d,1)) * 1000000 + int(bb.data.getVar('K_MICRO',d,1)) * 10000 + float(bb.data.getVar('HHV',d,1)))}"
diff --git a/packages/linux/handhelds-un-2.6_2.6.16.bb b/packages/linux/handhelds-un-2.6_2.6.16.bb
index b261d30a7e..e8af593ef3 100644
--- a/packages/linux/handhelds-un-2.6_2.6.16.bb
+++ b/packages/linux/handhelds-un-2.6_2.6.16.bb
@@ -3,7 +3,7 @@ MAINTAINER = "goxboxlive <goxboxlive@gmail.com>"
 LICENSE = "GPL"
 PR="r0"
 
-SRC_URI = "cvs -d :pserver:anoncvs@anoncvs.handhelds.org:/cvs checkout -d linux-2.6.16-hh2 linux/kernel26"
+SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26;tag=linux-2.6.16-hh2"
 S = "${WORKDIR}/linux-2.6.16-hh2"
 
 COMPATIBLE_HOST = "arm.*-linux"
diff --git a/packages/linux/linux-ezx_2.6.16.13.bb b/packages/linux/linux-ezx_2.6.16.13.bb
index 27258a5b58..f326321217 100644
--- a/packages/linux/linux-ezx_2.6.16.13.bb
+++ b/packages/linux/linux-ezx_2.6.16.13.bb
@@ -6,7 +6,7 @@ MAINTAINER = "Michael 'Mickey' Lauer <mickey@vanille.de>"
 LICENSE = "GPL"
 DEPENDS += "quilt-native"
 EZX = "ezx6"
-PR = "${EZX}-r12"
+PR = "${EZX}-r13"
 
 inherit kernel
 
@@ -65,7 +65,7 @@ CMDLINE_ROOT = "root=/dev/mmcblk0p1 rootfstype=ext3 rootdelay=5"
 #CMDLINE_OTHER = "dyntick=enable"
 CMDLINE_DEBUG = '${@base_conditional("DISTRO_TYPE", "release", "quiet", "debug",d)}'
 CMDLINE_IP = "ip=192.168.1.2:192.168.1.10:192.168.1.10:255.255.255.0:ezx:usb0:off"
-CMDLINE = "${CMDLINE_CON} ${CMDLINE_ROOT} ${CMDLINE_IP} ${CMDLINE_ROTATE} ${CMDLINE_OTHER} ${CMDLINE_DEBUG} mem=32M"
+CMDLINE = "${CMDLINE_CON} ${CMDLINE_ROOT} ${CMDLINE_IP} ${CMDLINE_ROTATE} ${CMDLINE_OTHER} ${CMDLINE_DEBUG} mem=32M@0xA0000000 mem=16M@0xAC000000"
 
 ###############################################################
 # module configs specific to this kernel
diff --git a/packages/linux/linux-jlime-arm-2.6.17/defconf_jlime b/packages/linux/linux-jlime-arm-2.6.17/defconf_jlime
index 05b0b1f1fb..38fce226a1 100644
--- a/packages/linux/linux-jlime-arm-2.6.17/defconf_jlime
+++ b/packages/linux/linux-jlime-arm-2.6.17/defconf_jlime
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.17
-# Mon Jul 10 17:53:59 2006
+# Thu Jul 13 18:12:14 2006
 #
 CONFIG_ARM=y
 CONFIG_MMU=y
@@ -14,7 +14,7 @@ CONFIG_VECTORS_BASE=0xffff0000
 #
 # Code maturity level options
 #
-# CONFIG_EXPERIMENTAL is not set
+CONFIG_EXPERIMENTAL=y
 CONFIG_BROKEN_ON_SMP=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
 
@@ -25,6 +25,7 @@ CONFIG_LOCALVERSION=""
 CONFIG_LOCALVERSION_AUTO=y
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
+# CONFIG_POSIX_MQUEUE is not set
 CONFIG_BSD_PROCESS_ACCT=y
 # CONFIG_BSD_PROCESS_ACCT_V3 is not set
 CONFIG_SYSCTL=y
@@ -34,7 +35,7 @@ CONFIG_IKCONFIG_PROC=y
 CONFIG_RELAY=y
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_UID16=y
-CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 # CONFIG_EMBEDDED is not set
 CONFIG_KALLSYMS=y
 # CONFIG_KALLSYMS_EXTRA_PASS is not set
@@ -56,6 +57,7 @@ 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
@@ -154,6 +156,7 @@ CONFIG_ISA=y
 CONFIG_PCCARD=y
 # CONFIG_PCMCIA_DEBUG is not set
 CONFIG_PCMCIA=y
+CONFIG_PCMCIA_LOAD_CIS=y
 CONFIG_PCMCIA_IOCTL=y
 
 #
@@ -161,17 +164,22 @@ CONFIG_PCMCIA_IOCTL=y
 #
 # CONFIG_I82365 is not set
 # CONFIG_TCIC is not set
-# CONFIG_PCMCIA_SA1100 is not set
+CONFIG_PCMCIA_SA1100=y
 CONFIG_PCMCIA_SA1111=y
 
 #
 # Kernel Features
 #
+# CONFIG_PREEMPT is not set
 # CONFIG_NO_IDLE_HZ is not set
 CONFIG_HZ=100
 # CONFIG_AEABI is not set
 CONFIG_ARCH_DISCONTIGMEM_ENABLE=y
 CONFIG_NODES_SHIFT=2
+CONFIG_SELECT_MEMORY_MODEL=y
+# CONFIG_FLATMEM_MANUAL is not set
+CONFIG_DISCONTIGMEM_MANUAL=y
+# CONFIG_SPARSEMEM_MANUAL is not set
 CONFIG_DISCONTIGMEM=y
 CONFIG_FLAT_NODE_MEM_MAP=y
 CONFIG_NEED_MULTIPLE_NODES=y
@@ -202,6 +210,7 @@ CONFIG_CMDLINE=""
 #
 CONFIG_FPE_NWFPE=y
 # CONFIG_FPE_NWFPE_XP is not set
+# CONFIG_FPE_FASTFPE is not set
 
 #
 # Userspace binary formats
@@ -209,7 +218,7 @@ CONFIG_FPE_NWFPE=y
 CONFIG_BINFMT_ELF=y
 # CONFIG_BINFMT_AOUT is not set
 # CONFIG_BINFMT_MISC is not set
-CONFIG_ARTHUR=y
+# CONFIG_ARTHUR is not set
 
 #
 # Power management options
@@ -250,6 +259,7 @@ CONFIG_IP_PNP=y
 # 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=y
 CONFIG_INET_ESP=y
@@ -264,12 +274,33 @@ CONFIG_TCP_CONG_BIC=y
 # CONFIG_INET6_XFRM_TUNNEL is not set
 # CONFIG_INET6_TUNNEL is not set
 # CONFIG_NETFILTER is not set
+
+#
+# DCCP Configuration (EXPERIMENTAL)
+#
+# CONFIG_IP_DCCP is not set
+
+#
+# SCTP Configuration (EXPERIMENTAL)
+#
+# CONFIG_IP_SCTP is not set
+
+#
+# TIPC Configuration (EXPERIMENTAL)
+#
+# CONFIG_TIPC is not set
+# CONFIG_ATM is not set
 # CONFIG_BRIDGE is not set
 # 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_NET_DIVERT is not set
+# CONFIG_ECONET is not set
+# CONFIG_WAN_ROUTER is not set
 
 #
 # QoS and/or fair queueing
@@ -349,6 +380,7 @@ CONFIG_IEEE80211=y
 CONFIG_IEEE80211_CRYPT_WEP=y
 CONFIG_IEEE80211_CRYPT_CCMP=y
 CONFIG_IEEE80211_CRYPT_TKIP=y
+# CONFIG_IEEE80211_SOFTMAC is not set
 CONFIG_WIRELESS_EXT=y
 
 #
@@ -408,6 +440,7 @@ CONFIG_BLK_DEV_IDE=y
 # CONFIG_IDEDISK_MULTI_MODE is not set
 CONFIG_BLK_DEV_IDECS=y
 # 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
 
@@ -474,6 +507,7 @@ CONFIG_MII=m
 # CONFIG_SMC91X is not set
 # CONFIG_DM9000 is not set
 # CONFIG_NET_VENDOR_RACAL is not set
+# CONFIG_AT1700 is not set
 # CONFIG_DEPCA is not set
 # CONFIG_HP100 is not set
 # CONFIG_NET_ISA is not set
@@ -525,6 +559,7 @@ CONFIG_PCMCIA_HERMES=m
 CONFIG_PCMCIA_SPECTRUM=m
 CONFIG_AIRO_CS=m
 CONFIG_PCMCIA_ATMEL=m
+# CONFIG_PCMCIA_WL3501 is not set
 CONFIG_HOSTAP=m
 CONFIG_HOSTAP_FIRMWARE=y
 CONFIG_HOSTAP_FIRMWARE_NVRAM=y
@@ -549,12 +584,17 @@ CONFIG_PCMCIA_AXNET=m
 #
 # CONFIG_WAN is not set
 CONFIG_PPP=m
+# CONFIG_PPP_MULTILINK is not set
 # CONFIG_PPP_FILTER is not set
 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 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
 
@@ -660,6 +700,8 @@ CONFIG_LEGACY_PTY_COUNT=16
 #
 # TPM devices
 #
+# CONFIG_TCG_TPM is not set
+# CONFIG_TELCLOCK is not set
 
 #
 # I2C support
@@ -682,6 +724,7 @@ CONFIG_LEGACY_PTY_COUNT=16
 #
 CONFIG_HWMON=y
 # CONFIG_HWMON_VID is not set
+# CONFIG_SENSORS_F71805F is not set
 # CONFIG_HWMON_DEBUG_CHIP is not set
 
 #
@@ -788,6 +831,23 @@ CONFIG_USB_ARCH_HAS_OHCI=y
 # Real Time Clock
 #
 CONFIG_RTC_LIB=y
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_HCTOSYS=y
+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
+
+#
+# RTC interfaces
+#
+CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_INTF_PROC=y
+CONFIG_RTC_INTF_DEV=y
+
+#
+# RTC drivers
+#
+# CONFIG_RTC_DRV_M48T86 is not set
+CONFIG_RTC_DRV_SA1100=y
+# CONFIG_RTC_DRV_TEST is not set
 
 #
 # File systems
@@ -806,13 +866,14 @@ CONFIG_FS_MBCACHE=y
 # CONFIG_JFS_FS is not set
 # CONFIG_FS_POSIX_ACL is not set
 # CONFIG_XFS_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_QUOTA is not set
 CONFIG_DNOTIFY=y
 # CONFIG_AUTOFS_FS is not set
-CONFIG_AUTOFS4_FS=y
+# CONFIG_AUTOFS4_FS is not set
 # CONFIG_FUSE_FS is not set
 
 #
@@ -839,11 +900,18 @@ CONFIG_SYSFS=y
 CONFIG_TMPFS=y
 # 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_CRAMFS is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_HPFS_FS is not set
@@ -856,6 +924,8 @@ CONFIG_RAMFS=y
 #
 CONFIG_NFS_FS=m
 # CONFIG_NFS_V3 is not set
+# CONFIG_NFS_V4 is not set
+# CONFIG_NFS_DIRECTIO is not set
 CONFIG_NFSD=m
 # CONFIG_NFSD_V3 is not set
 CONFIG_NFSD_TCP=y
@@ -863,11 +933,15 @@ CONFIG_LOCKD=m
 CONFIG_EXPORTFS=m
 CONFIG_NFS_COMMON=y
 CONFIG_SUNRPC=m
+# 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
+# CONFIG_9P_FS is not set
 
 #
 # Partition Types
@@ -920,6 +994,11 @@ CONFIG_NLS_KOI8_U=m
 CONFIG_NLS_UTF8=m
 
 #
+# Profiling support
+#
+# CONFIG_PROFILING is not set
+
+#
 # Kernel hacking
 #
 # CONFIG_PRINTK_TIME is not set
diff --git a/packages/linux/linux-jlime-sh3-2.6.17/defconfig_jlime b/packages/linux/linux-jlime-sh3-2.6.17/defconfig_jlime
index 2ad9b09cc8..0b68fa7c64 100644
--- a/packages/linux/linux-jlime-sh3-2.6.17/defconfig_jlime
+++ b/packages/linux/linux-jlime-sh3-2.6.17/defconfig_jlime
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.17
-# Wed Jul 12 17:39:16 2006
+# Thu Jul 13 16:52:12 2006
 #
 CONFIG_SUPERH=y
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
@@ -14,7 +14,7 @@ CONFIG_GENERIC_CALIBRATE_DELAY=y
 #
 # Code maturity level options
 #
-# CONFIG_EXPERIMENTAL is not set
+CONFIG_EXPERIMENTAL=y
 CONFIG_BROKEN_ON_SMP=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
 
@@ -25,15 +25,17 @@ CONFIG_LOCALVERSION=""
 CONFIG_LOCALVERSION_AUTO=y
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
+# CONFIG_POSIX_MQUEUE is not set
 CONFIG_BSD_PROCESS_ACCT=y
 # CONFIG_BSD_PROCESS_ACCT_V3 is not set
-CONFIG_SYSCTL=y
+# CONFIG_SYSCTL is not set
 # CONFIG_AUDIT is not set
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
 # CONFIG_RELAY is not set
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_UID16=y
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 # CONFIG_EMBEDDED is not set
 CONFIG_KALLSYMS=y
 # CONFIG_KALLSYMS_EXTRA_PASS is not set
@@ -55,6 +57,7 @@ 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
@@ -159,6 +162,10 @@ CONFIG_CPU_SUBTYPE_SH7709=y
 # Memory management options
 #
 CONFIG_MMU=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
@@ -170,7 +177,7 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
 # CONFIG_SH_DIRECT_MAPPED is not set
 # CONFIG_SH_WRITETHROUGH is not set
 # CONFIG_SH_OCRAM is not set
-CONFIG_MEMORY_START=0x0c000000
+CONFIG_MEMORY_START=0x0d000000
 CONFIG_MEMORY_SIZE=0x00400000
 
 #
@@ -178,6 +185,7 @@ CONFIG_MEMORY_SIZE=0x00400000
 #
 CONFIG_CPU_LITTLE_ENDIAN=y
 CONFIG_SH_RTC=y
+CONFIG_SH_FPU_EMU=y
 # CONFIG_SH_DSP is not set
 CONFIG_SH_ADC=y
 CONFIG_CPU_HAS_INTEVT=y
@@ -215,6 +223,8 @@ CONFIG_HD64461_ENABLER=y
 #
 # Kernel features
 #
+# CONFIG_KEXEC is not set
+# CONFIG_PREEMPT is not set
 # CONFIG_SMP is not set
 
 #
@@ -237,6 +247,7 @@ CONFIG_ISA=y
 CONFIG_PCCARD=y
 # CONFIG_PCMCIA_DEBUG is not set
 CONFIG_PCMCIA=y
+CONFIG_PCMCIA_LOAD_CIS=y
 CONFIG_PCMCIA_IOCTL=y
 
 #
@@ -260,6 +271,14 @@ CONFIG_BINFMT_ELF=y
 # CONFIG_BINFMT_MISC is not set
 
 #
+# Power management options (EXPERIMENTAL)
+#
+CONFIG_PM=y
+CONFIG_PM_LEGACY=y
+# CONFIG_PM_DEBUG is not set
+CONFIG_APM=y
+
+#
 # Networking
 #
 CONFIG_NET=y
@@ -272,21 +291,16 @@ CONFIG_PACKET=y
 CONFIG_PACKET_MMAP=y
 CONFIG_UNIX=y
 CONFIG_XFRM=y
-CONFIG_XFRM_USER=y
+# CONFIG_XFRM_USER is not set
 CONFIG_NET_KEY=y
 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_MULTICAST is not set
+# CONFIG_IP_ADVANCED_ROUTER is not set
 CONFIG_IP_FIB_HASH=y
-CONFIG_IP_MULTIPLE_TABLES=y
-# CONFIG_IP_ROUTE_MULTIPATH is not set
-# CONFIG_IP_ROUTE_VERBOSE is not set
 # CONFIG_IP_PNP 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 is not set
 # CONFIG_INET_AH is not set
 # CONFIG_INET_ESP is not set
@@ -301,12 +315,33 @@ CONFIG_TCP_CONG_BIC=y
 # CONFIG_INET6_XFRM_TUNNEL is not set
 # CONFIG_INET6_TUNNEL is not set
 # CONFIG_NETFILTER is not set
+
+#
+# DCCP Configuration (EXPERIMENTAL)
+#
+# CONFIG_IP_DCCP is not set
+
+#
+# SCTP Configuration (EXPERIMENTAL)
+#
+# CONFIG_IP_SCTP is not set
+
+#
+# TIPC Configuration (EXPERIMENTAL)
+#
+# CONFIG_TIPC is not set
+# CONFIG_ATM is not set
 # CONFIG_BRIDGE is not set
 # 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_NET_DIVERT is not set
+# CONFIG_ECONET is not set
+# CONFIG_WAN_ROUTER is not set
 
 #
 # QoS and/or fair queueing
@@ -323,8 +358,7 @@ CONFIG_IRDA=m
 #
 # IrDA protocols
 #
-CONFIG_IRLAN=m
-CONFIG_IRNET=m
+# CONFIG_IRLAN is not set
 # CONFIG_IRCOMM is not set
 # CONFIG_IRDA_ULTRA is not set
 
@@ -351,42 +385,35 @@ CONFIG_IRNET=m
 #
 # Old SIR device drivers
 #
-CONFIG_IRPORT_SIR=m
+# CONFIG_IRPORT_SIR is not set
 
 #
 # Old Serial dongle support
 #
-# CONFIG_DONGLE_OLD is not set
 
 #
 # FIR device drivers
 #
 CONFIG_BT=m
-CONFIG_BT_L2CAP=m
-CONFIG_BT_SCO=m
-CONFIG_BT_RFCOMM=m
-# CONFIG_BT_RFCOMM_TTY is not set
-CONFIG_BT_BNEP=m
-# CONFIG_BT_BNEP_MC_FILTER is not set
-# CONFIG_BT_BNEP_PROTO_FILTER is not set
-CONFIG_BT_HIDP=m
+# CONFIG_BT_L2CAP is not set
+# CONFIG_BT_SCO is not set
 
 #
 # Bluetooth device drivers
 #
-CONFIG_BT_HCIUART=m
-CONFIG_BT_HCIUART_H4=y
-CONFIG_BT_HCIUART_BCSP=y
-CONFIG_BT_HCIDTL1=m
-CONFIG_BT_HCIBT3C=m
-CONFIG_BT_HCIBLUECARD=m
-CONFIG_BT_HCIBTUART=m
-CONFIG_BT_HCIVHCI=m
-CONFIG_IEEE80211=y
+# CONFIG_BT_HCIUART is not set
+# CONFIG_BT_HCIDTL1 is not set
+# CONFIG_BT_HCIBT3C is not set
+# CONFIG_BT_HCIBLUECARD is not set
+# CONFIG_BT_HCIBTUART is not set
+# CONFIG_BT_HCIVHCI is not set
+CONFIG_IEEE80211=m
 # CONFIG_IEEE80211_DEBUG is not set
-CONFIG_IEEE80211_CRYPT_WEP=y
-CONFIG_IEEE80211_CRYPT_CCMP=y
-CONFIG_IEEE80211_CRYPT_TKIP=y
+CONFIG_IEEE80211_CRYPT_WEP=m
+CONFIG_IEEE80211_CRYPT_CCMP=m
+# CONFIG_IEEE80211_CRYPT_TKIP is not set
+CONFIG_IEEE80211_SOFTMAC=m
+# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
 CONFIG_WIRELESS_EXT=y
 
 #
@@ -397,7 +424,7 @@ CONFIG_WIRELESS_EXT=y
 # Generic Driver Options
 #
 CONFIG_STANDALONE=y
-CONFIG_PREVENT_FIRMWARE_BUILD=y
+# CONFIG_PREVENT_FIRMWARE_BUILD is not set
 CONFIG_FW_LOADER=y
 
 #
@@ -418,13 +445,7 @@ CONFIG_FW_LOADER=y
 #
 # Plug and Play support
 #
-CONFIG_PNP=y
-# CONFIG_PNP_DEBUG is not set
-
-#
-# Protocols
-#
-# CONFIG_ISAPNP is not set
+# CONFIG_PNP is not set
 
 #
 # Block devices
@@ -450,17 +471,17 @@ CONFIG_BLK_DEV_IDE=y
 #
 # CONFIG_BLK_DEV_IDE_SATA is not set
 CONFIG_BLK_DEV_IDEDISK=y
-CONFIG_IDEDISK_MULTI_MODE=y
+# CONFIG_IDEDISK_MULTI_MODE is not set
 CONFIG_BLK_DEV_IDECS=y
 # 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=y
+# CONFIG_IDE_TASK_IOCTL is not set
 
 #
 # IDE chipset support/bugfixes
 #
 CONFIG_IDE_GENERIC=y
-# CONFIG_BLK_DEV_IDEPNP is not set
 CONFIG_IDE_SH=y
 # CONFIG_IDE_ARM is not set
 # CONFIG_IDE_CHIPSETS is not set
@@ -501,11 +522,10 @@ CONFIG_IDE_SH=y
 # Network device support
 #
 CONFIG_NETDEVICES=y
-CONFIG_DUMMY=y
+# CONFIG_DUMMY is not set
 # CONFIG_BONDING is not set
 # CONFIG_EQUALIZER is not set
 # CONFIG_TUN is not set
-# CONFIG_NET_SB1000 is not set
 
 #
 # ARCnet devices
@@ -515,23 +535,13 @@ CONFIG_DUMMY=y
 #
 # PHY device support
 #
-# CONFIG_PHYLIB is not set
 
 #
 # Ethernet (10 or 100Mbit)
 #
-CONFIG_NET_ETHERNET=y
+# CONFIG_NET_ETHERNET is not set
 CONFIG_MII=m
-# CONFIG_STNIC is not set
-# CONFIG_NET_VENDOR_3COM is not set
-# CONFIG_NET_VENDOR_SMC is not set
-# CONFIG_SMC91X is not set
-# CONFIG_NET_VENDOR_RACAL is not set
-# CONFIG_DEPCA is not set
-# CONFIG_HP100 is not set
-# CONFIG_NET_ISA is not set
 # CONFIG_NE2000 is not set
-# CONFIG_NET_PCI is not set
 
 #
 # Ethernet (1000 Mbit)
@@ -579,6 +589,7 @@ CONFIG_PCMCIA_HERMES=m
 CONFIG_PCMCIA_SPECTRUM=m
 CONFIG_AIRO_CS=m
 CONFIG_PCMCIA_ATMEL=m
+CONFIG_PCMCIA_WL3501=m
 CONFIG_HOSTAP=m
 CONFIG_HOSTAP_FIRMWARE=y
 CONFIG_HOSTAP_FIRMWARE_NVRAM=y
@@ -602,16 +613,10 @@ CONFIG_PCMCIA_AXNET=m
 # Wan interfaces
 #
 # CONFIG_WAN is not set
-CONFIG_PPP=m
-# CONFIG_PPP_FILTER is not set
-CONFIG_PPP_ASYNC=m
-CONFIG_PPP_SYNC_TTY=m
-CONFIG_PPP_DEFLATE=m
-CONFIG_PPP_BSDCOMP=m
-CONFIG_SLIP=m
-# CONFIG_SLIP_COMPRESSED is not set
-# CONFIG_SLIP_SMART is not set
-# CONFIG_SLIP_MODE_SLIP6 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
 
@@ -727,34 +732,13 @@ CONFIG_LEGACY_PTY_COUNT=8
 #
 # TPM devices
 #
+# CONFIG_TCG_TPM is not set
+# CONFIG_TELCLOCK is not set
 
 #
 # I2C support
 #
-CONFIG_I2C=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_ELEKTOR is not set
-# CONFIG_I2C_PARPORT_LIGHT is not set
-# CONFIG_I2C_PCA_ISA is not set
-
-#
-# Miscellaneous I2C Chip support
-#
-# 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
+# CONFIG_I2C is not set
 
 #
 # SPI support
@@ -772,14 +756,7 @@ CONFIG_I2C_CHARDEV=y
 #
 CONFIG_HWMON=y
 # CONFIG_HWMON_VID is not set
-# CONFIG_SENSORS_ADM1021 is not set
-# CONFIG_SENSORS_GL518SM is not set
-# CONFIG_SENSORS_IT87 is not set
-# CONFIG_SENSORS_LM75 is not set
-# CONFIG_SENSORS_LM83 is not set
-# CONFIG_SENSORS_LM90 is not set
-# CONFIG_SENSORS_W83781D is not set
-# CONFIG_SENSORS_W83627HF is not set
+# CONFIG_SENSORS_F71805F is not set
 # CONFIG_HWMON_DEBUG_CHIP is not set
 
 #
@@ -859,7 +836,6 @@ CONFIG_SOUND=y
 CONFIG_SOUND_PRIME=y
 # CONFIG_SOUND_MSNDCLAS is not set
 # CONFIG_SOUND_MSNDPIN is not set
-# CONFIG_SOUND_TVMIXER is not set
 CONFIG_SOUND_SH_DAC_AUDIO=y
 CONFIG_SOUND_SH_DAC_AUDIO_CHANNEL=1
 
@@ -908,6 +884,24 @@ CONFIG_SOUND_SH_DAC_AUDIO_CHANNEL=1
 #
 # Real Time Clock
 #
+CONFIG_RTC_LIB=y
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_HCTOSYS=y
+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
+
+#
+# RTC interfaces
+#
+CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_INTF_PROC=y
+CONFIG_RTC_INTF_DEV=y
+
+#
+# RTC drivers
+#
+# CONFIG_RTC_DRV_M48T86 is not set
+CONFIG_RTC_DRV_SH=y
+# CONFIG_RTC_DRV_TEST is not set
 
 #
 # File systems
@@ -916,20 +910,24 @@ 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 is not set
+CONFIG_EXT3_FS_XATTR=y
+# CONFIG_EXT3_FS_POSIX_ACL is not set
+# CONFIG_EXT3_FS_SECURITY 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_OCFS2_FS is not set
 # CONFIG_MINIX_FS is not set
 # CONFIG_ROMFS_FS is not set
-# CONFIG_INOTIFY is not set
+CONFIG_INOTIFY=y
 # CONFIG_QUOTA is not set
 CONFIG_DNOTIFY=y
 # CONFIG_AUTOFS_FS is not set
-CONFIG_AUTOFS4_FS=y
+# CONFIG_AUTOFS4_FS is not set
 # CONFIG_FUSE_FS is not set
 
 #
@@ -942,7 +940,7 @@ CONFIG_AUTOFS4_FS=y
 # DOS/FAT/NT Filesystems
 #
 CONFIG_FAT_FS=y
-CONFIG_MSDOS_FS=y
+# CONFIG_MSDOS_FS is not set
 CONFIG_VFAT_FS=y
 CONFIG_FAT_DEFAULT_CODEPAGE=437
 CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
@@ -954,15 +952,22 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
 CONFIG_PROC_FS=y
 CONFIG_PROC_KCORE=y
 CONFIG_SYSFS=y
-CONFIG_TMPFS=y
+# CONFIG_TMPFS is not set
 # CONFIG_HUGETLBFS 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_CRAMFS is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_HPFS_FS is not set
@@ -974,28 +979,46 @@ CONFIG_RAMFS=y
 # Network File Systems
 #
 CONFIG_NFS_FS=m
-CONFIG_NFS_V3=y
-# CONFIG_NFS_V3_ACL is not set
+# CONFIG_NFS_V3 is not set
+# CONFIG_NFS_V4 is not set
+# CONFIG_NFS_DIRECTIO is not set
 CONFIG_NFSD=m
-CONFIG_NFSD_V3=y
-# CONFIG_NFSD_V3_ACL is not set
+# CONFIG_NFSD_V3 is not set
 CONFIG_NFSD_TCP=y
 CONFIG_LOCKD=m
-CONFIG_LOCKD_V4=y
 CONFIG_EXPORTFS=m
 CONFIG_NFS_COMMON=y
 CONFIG_SUNRPC=m
+# 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
+# CONFIG_9P_FS is not set
 
 #
 # Partition Types
 #
-# CONFIG_PARTITION_ADVANCED is not set
+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
 
 #
 # Native Language Support
@@ -1005,8 +1028,8 @@ CONFIG_NLS_DEFAULT="iso8859-1"
 CONFIG_NLS_CODEPAGE_437=y
 CONFIG_NLS_CODEPAGE_737=m
 CONFIG_NLS_CODEPAGE_775=m
-CONFIG_NLS_CODEPAGE_850=y
-CONFIG_NLS_CODEPAGE_852=y
+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
@@ -1026,10 +1049,10 @@ CONFIG_NLS_ISO8859_8=m
 CONFIG_NLS_CODEPAGE_1250=m
 CONFIG_NLS_CODEPAGE_1251=m
 CONFIG_NLS_ASCII=m
-CONFIG_NLS_ISO8859_1=y
-CONFIG_NLS_ISO8859_2=y
-CONFIG_NLS_ISO8859_3=y
-CONFIG_NLS_ISO8859_4=y
+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
@@ -1042,6 +1065,11 @@ CONFIG_NLS_KOI8_U=m
 CONFIG_NLS_UTF8=m
 
 #
+# Profiling support
+#
+# CONFIG_PROFILING is not set
+
+#
 # Kernel hacking
 #
 # CONFIG_PRINTK_TIME is not set
@@ -1062,30 +1090,30 @@ CONFIG_LOG_BUF_SHIFT=14
 # Cryptographic options
 #
 CONFIG_CRYPTO=y
-CONFIG_CRYPTO_HMAC=y
-CONFIG_CRYPTO_NULL=m
-CONFIG_CRYPTO_MD4=m
-CONFIG_CRYPTO_MD5=m
-CONFIG_CRYPTO_SHA1=m
-CONFIG_CRYPTO_SHA256=m
-CONFIG_CRYPTO_SHA512=m
-CONFIG_CRYPTO_WP512=m
-CONFIG_CRYPTO_TGR192=m
-CONFIG_CRYPTO_DES=m
-CONFIG_CRYPTO_BLOWFISH=m
-CONFIG_CRYPTO_TWOFISH=m
-CONFIG_CRYPTO_SERPENT=m
-CONFIG_CRYPTO_AES=y
-CONFIG_CRYPTO_CAST5=m
-CONFIG_CRYPTO_CAST6=m
-CONFIG_CRYPTO_TEA=m
-CONFIG_CRYPTO_ARC4=y
-CONFIG_CRYPTO_KHAZAD=m
-CONFIG_CRYPTO_ANUBIS=m
-CONFIG_CRYPTO_DEFLATE=m
-CONFIG_CRYPTO_MICHAEL_MIC=y
-CONFIG_CRYPTO_CRC32C=m
-CONFIG_CRYPTO_TEST=m
+# CONFIG_CRYPTO_HMAC 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_DES is not set
+# CONFIG_CRYPTO_BLOWFISH is not set
+# CONFIG_CRYPTO_TWOFISH is not set
+# CONFIG_CRYPTO_SERPENT is not set
+CONFIG_CRYPTO_AES=m
+# CONFIG_CRYPTO_CAST5 is not set
+# CONFIG_CRYPTO_CAST6 is not set
+# CONFIG_CRYPTO_TEA is not set
+CONFIG_CRYPTO_ARC4=m
+# 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_TEST is not set
 
 #
 # Hardware crypto devices
@@ -1094,9 +1122,7 @@ CONFIG_CRYPTO_TEST=m
 #
 # Library routines
 #
-CONFIG_CRC_CCITT=y
-CONFIG_CRC16=y
+CONFIG_CRC_CCITT=m
+CONFIG_CRC16=m
 CONFIG_CRC32=y
-CONFIG_LIBCRC32C=y
-CONFIG_ZLIB_INFLATE=m
-CONFIG_ZLIB_DEFLATE=m
+CONFIG_LIBCRC32C=m
diff --git a/packages/linux/linux-jlime-sh3-2.6.17/keymap-fix.patch b/packages/linux/linux-jlime-sh3-2.6.17/keymap-fix.patch
new file mode 100644
index 0000000000..b62d2d8272
--- /dev/null
+++ b/packages/linux/linux-jlime-sh3-2.6.17/keymap-fix.patch
@@ -0,0 +1,408 @@
+--- linux-2.6.17-vanilla/drivers/char/defkeymap.map	2006-06-18 01:49:35.000000000 +0000
++++ linux-2.6.17/drivers/char/defkeymap.map	2006-07-13 16:43:20.000000000 +0000
+@@ -1,264 +1,185 @@
+-# 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.
+-#
+-# In fact AltGr is used very little, and one more keymap can
+-# be saved by mapping AltGr to Alt (and adapting a few entries):
+-# keycode 100 = Alt
++# 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          
+-	alt     keycode   2 = Meta_one        
+-keycode   3 = two              at               at              
+-	control	keycode   3 = nul             
+-	shift	control	keycode   3 = nul             
+-	alt	keycode   3 = Meta_two        
++	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      
+-	control keycode   4 = Escape          
+-	alt     keycode   4 = Meta_three      
+-keycode   5 = four             dollar           dollar          
+-	control keycode   5 = Control_backslash
+-	alt     keycode   5 = Meta_four       
++	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       
++	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      
++	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 = Meta_nine       
++	alt	keycode  10 = KP_9       
+ 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      
++	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      
++	alt	keycode  13 = Meta_equal      
+ keycode  14 = Delete           Delete          
+-	control keycode  14 = BackSpace
+-	alt     keycode  14 = Meta_Delete     
++	control	keycode  14 = BackSpace       
++	alt	keycode  14 = Meta_Delete     
+ keycode  15 = Tab              Tab             
+-	alt     keycode  15 = Meta_Tab        
++	alt	keycode  15 = Meta_Tab        
+ keycode  16 = q               
+ keycode  17 = w               
+ keycode  18 = e
+-	altgr   keycode  18 = Hex_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               
+-keycode  24 = o               
+-keycode  25 = p               
+-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
++	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  
++	alt	keycode  28 = Meta_Control_m  
+ keycode  29 = Control         
++	altgr	keycode  29 = Num_Lock
+ keycode  30 = a
+-	altgr   keycode  30 = Hex_A
+ keycode  31 = s               
+ keycode  32 = d
+-	altgr   keycode  32 = Hex_D   
+ keycode  33 = f
+-	altgr   keycode  33 = Hex_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               
+-keycode  39 = semicolon        colon           
+-	alt     keycode  39 = Meta_semicolon  
+-keycode  40 = apostrophe       quotedbl        
+-	control keycode  40 = Control_g       
+-	alt     keycode  40 = Meta_apostrophe 
+-keycode  41 = grave            asciitilde      
+-	control keycode  41 = nul             
+-	alt     keycode  41 = Meta_grave      
++	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           
+-keycode  43 = backslash        bar             
+-	control keycode  43 = Control_backslash
+-	alt     keycode  43 = Meta_backslash  
++	altgr	keycode  42 = Caps_Lock
+ keycode  44 = z               
+ keycode  45 = x               
+ keycode  46 = c
+-	altgr   keycode  46 = Hex_C   
+ keycode  47 = v               
+ keycode  48 = b
+-	altgr   keycode  48 = Hex_B
+ keycode  49 = n               
++	alt	keycode  49 = KP_0
+ keycode  50 = m               
++	alt	keycode  50 = KP_Comma
+ keycode  51 = comma            less            
+-	alt     keycode  51 = Meta_comma      
++	alt	keycode  51 = KP_Period      
+ keycode  52 = period           greater         
+-	control keycode  52 = Compose         
+-	alt     keycode  52 = Meta_period     
+-keycode  53 = slash            question        
+-	control keycode  53 = Delete          
+-	alt     keycode  53 = Meta_slash      
+-keycode  54 = Shift           
+-keycode  55 = KP_Multiply     
++	control	keycode  52 = Compose         
++	alt	keycode  52 = KP_Add     
++keycode  54 = Shift 
+ keycode  56 = Alt             
+ keycode  57 = space            space           
+-	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 =
+-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              
+-keycode 104 = Prior           
+-	shift   keycode 104 = Scroll_Backward 
+-keycode 105 = Left            
+-	alt     keycode 105 = Decr_Console
+-keycode 106 = Right           
+-	alt     keycode 106 = Incr_Console
+-keycode 107 = Select          
+-keycode 108 = Down            
+-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 =
++	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"
diff --git a/packages/linux/linux-jlime-sh3_2.6.17.bb b/packages/linux/linux-jlime-sh3_2.6.17.bb
index c9c6326f24..68f51b8e08 100644
--- a/packages/linux/linux-jlime-sh3_2.6.17.bb
+++ b/packages/linux/linux-jlime-sh3_2.6.17.bb
@@ -9,7 +9,8 @@ COMPATIBLE_HOST = "sh.*-linux"
 SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.17.tar.gz \
            file://defconfig_jlime \
 	   file://LinuxSH-2.6.17.patch;patch=0 \
-	   file://unexpected-int-fix.patch;patch=0"
+	   file://unexpected-int-fix.patch;patch=0 \
+	   file://keymap-fix.patch;patch=0"
 	   	            
 S = "${WORKDIR}/linux-${PV}"