diff options
7 files changed, 82 insertions, 6 deletions
diff --git a/conf/machine/zaurus-clamshell-2.4.conf b/conf/machine/zaurus-clamshell-2.4.conf index 0040222337..6f06e54cdb 100644 --- a/conf/machine/zaurus-clamshell-2.4.conf +++ b/conf/machine/zaurus-clamshell-2.4.conf @@ -14,4 +14,5 @@ BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-usbdcore kernel-module-usbdmonitor" # Bluetooth Modules BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-bluez kernel-module-l2cap kernel-module-rfcomm kernel-module-hci-vhci \ kernel-module-bnep kernel-module-hidp kernel-module-hci-uart kernel-module-sco \ - kernel-module-bt3c-cs kernel-module-bluecard-cs kernel-module-btuart-cs kernel-module-dtl1-cs" + kernel-module-bluecard-cs kernel-module-btuart-cs kernel-module-dtl1-cs \ + kernel-module-firmware-class kernel-module-bt3c-cs" diff --git a/packages/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/enable-sysrq.patch b/packages/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/enable-sysrq.patch deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/enable-sysrq.patch +++ /dev/null diff --git a/packages/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/keyboard-ctrl+alt.patch b/packages/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/keyboard-ctrl+alt.patch deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/keyboard-ctrl+alt.patch +++ /dev/null diff --git a/packages/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/keymap-more-sane.patch b/packages/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/keymap-more-sane.patch deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/keymap-more-sane.patch +++ /dev/null diff --git a/packages/linux/openzaurus-pxa27x-2.4.20-rmk2-embedix20050228/enable-sysrq.patch b/packages/linux/openzaurus-pxa27x-2.4.20-rmk2-embedix20050228/enable-sysrq.patch index e69de29bb2..eaf58d1edc 100644 --- a/packages/linux/openzaurus-pxa27x-2.4.20-rmk2-embedix20050228/enable-sysrq.patch +++ b/packages/linux/openzaurus-pxa27x-2.4.20-rmk2-embedix20050228/enable-sysrq.patch @@ -0,0 +1,60 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- linux_n1/drivers/char/spitz_keyb.c~enable-sysrq ++++ linux_n1/drivers/char/spitz_keyb.c +@@ -28,6 +28,7 @@ + #include <linux/poll.h> + #include <linux/wait.h> + #include <asm/arch/keyboard.h> ++#include <asm/keyboard.h> + #include <asm/uaccess.h> + #include <linux/tqueue.h> + #include <linux/kbd_ll.h> +@@ -51,6 +52,18 @@ + #endif + + /* ++ * This is the KeyCode [not ScanCode!] to ASCII Code mapping table ++ */ ++ ++#ifdef CONFIG_MAGIC_SYSRQ ++static unsigned char spitz_sysrq_xlate[128] = ++ "\000abcdefghijklmno" /* 00-0f */ ++ "pqrstuvwxyz\000\000\000\000\000" /* 10-1f */ ++ " \000\000\000\000\000\000\000\0001234567" /* 20-2f */ ++ "890\000\000\000\000\000\000\000\000\000\000\000\000\000"; /* 30-3f */ ++#endif ++ ++/* + * common logical driver definition + */ + extern void sharppda_kbd_press(int keycode); +@@ -337,7 +350,13 @@ + spitz_kbd_pm_dev = pm_register(PM_SYS_DEV, 0, spitz_kbd_pm_callback); + #endif + +- printk("keyboard initilaized.\n"); ++ printk("keyboard initialized.\n"); ++#ifdef CONFIG_MAGIC_SYSRQ ++ k_sysrq_key = 0x28; // KEY_HOME ++ k_sysrq_xlate = spitz_sysrq_xlate; ++ printk("magic_sysrq initialized.\n"); ++#endif ++ + } + + int spitz_kbd_translate(unsigned char scancode, unsigned char *keycode_p) +--- linux_n1/drivers/char/keyboard.c~enable-sysrq ++++ linux_n1/drivers/char/keyboard.c +@@ -291,7 +291,7 @@ + #ifdef CONFIG_MAGIC_SYSRQ /* Handle the SysRq Hack */ + if (keycode == SYSRQ_KEY) { + sysrq_pressed = !up_flag; +- goto out; ++ // goto out; + } else if (sysrq_pressed) { + if (!up_flag) { + handle_sysrq(kbd_sysrq_xlate[keycode], kbd_pt_regs, kbd, tty); diff --git a/packages/linux/openzaurus-pxa27x-2.4.20-rmk2-embedix20050228/keymap-more-sane.patch b/packages/linux/openzaurus-pxa27x-2.4.20-rmk2-embedix20050228/keymap-more-sane.patch index e69de29bb2..82e8636d7e 100644 --- a/packages/linux/openzaurus-pxa27x-2.4.20-rmk2-embedix20050228/keymap-more-sane.patch +++ b/packages/linux/openzaurus-pxa27x-2.4.20-rmk2-embedix20050228/keymap-more-sane.patch @@ -0,0 +1,19 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- linux_n1/drivers/char/spitz_keymap.map~keymap-more-sane ++++ linux_n1/drivers/char/spitz_keymap.map +@@ -66,9 +66,11 @@ + keycode 32 = Num_Lock + keycode 34 = Escape + keycode 35 = Left ++ alt keycode 35 = Decr_Console + keycode 36 = Up + keycode 37 = Down + keycode 38 = Right ++ alt keycode 38 = Incr_Console + # (OK:39) F4 -> Return + keycode 39 = Return + keycode 40 = diff --git a/packages/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20050228.bb b/packages/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20050228.bb index 5eef4b41bf..ede978edb0 100644 --- a/packages/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20050228.bb +++ b/packages/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20050228.bb @@ -5,7 +5,7 @@ SECTION = "kernel" PV = "2.4.20-rmk2-embedix" LICENSE = "GPL" KV = "2.4.20" -PR = "r4" +PR = "r5" SRC_URI = "http://developer.ezaurus.com/sl_j/source/c1000/20050228/linux-c1000-20050228-rom1_01.tar.bz2 \ file://P01-C3000-clockup_050221.patch;pnum=2;patch=1 \ @@ -30,16 +30,12 @@ SRC_URI = "http://developer.ezaurus.com/sl_j/source/c1000/20050228/linux-c1000-2 file://iw241_we16-6.diff;patch=1 \ file://iw249_we17-13.diff;patch=1 \ file://bluecard_cs.patch;patch=1 \ - file://enable-sysrq.patch;patch=1 \ file://compile.patch;patch=1 \ file://idecs.patch;patch=1 \ file://logo.patch;patch=1 \ file://initsh.patch;patch=1 \ - file://keyboard-ctrl+alt.patch;patch=1 \ - file://keymap-more-sane.patch;patch=1 \ file://disable-pcmcia-probe.patch;patch=1 \ file://deviceinfo.patch;patch=1 \ - file://tosa_ts.patch;patch=1 \ file://corgi-fbcon-logo.patch;patch=1 \ file://corgi-default-brightness.patch;patch=1 \ file://1764-1.patch;patch=1 \ |