diff options
| author | nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2005-05-03 19:40:02 +0000 |
|---|---|---|
| committer | nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2005-05-03 19:40:02 +0000 |
| commit | bf1ae915d11b3bba1ebadb95b24acd267cb7e65f (patch) | |
| tree | 23d4697590b2bf946371ef298b9327e2268a8425 /packages/linux/openzaurus-pxa27x-2.4.20-rmk2-embedix20050228 | |
| parent | 66944efa040bdf36062522c7c33413fc1e039d83 (diff) | |
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded
2005/05/03 20:59:07+02:00 hrw.one.pl!hrw
reverted part of 1.3180.30.1 changeset - now openzaurus-pxa kernel should be buildable
I hope that next time Mickeyl (and others) will look where they do "bk rm" :)
BKrev: 4277d392xZMEIjLuoMSiDUrevH4X-Q
Diffstat (limited to 'packages/linux/openzaurus-pxa27x-2.4.20-rmk2-embedix20050228')
3 files changed, 0 insertions, 79 deletions
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 deleted file mode 100644 index eaf58d1edc..0000000000 --- a/packages/linux/openzaurus-pxa27x-2.4.20-rmk2-embedix20050228/enable-sysrq.patch +++ /dev/null @@ -1,60 +0,0 @@ - -# -# 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/keyboard-ctrl+alt.patch b/packages/linux/openzaurus-pxa27x-2.4.20-rmk2-embedix20050228/keyboard-ctrl+alt.patch deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/linux/openzaurus-pxa27x-2.4.20-rmk2-embedix20050228/keyboard-ctrl+alt.patch +++ /dev/null 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 deleted file mode 100644 index 82e8636d7e..0000000000 --- a/packages/linux/openzaurus-pxa27x-2.4.20-rmk2-embedix20050228/keymap-more-sane.patch +++ /dev/null @@ -1,19 +0,0 @@ - -# -# 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 = |