summaryrefslogtreecommitdiffstats
path: root/common/keyboard.c
diff options
context:
space:
mode:
Diffstat (limited to 'common/keyboard.c')
-rw-r--r--common/keyboard.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/common/keyboard.c b/common/keyboard.c
index ea4d0ee7e..9f0ca7676 100644
--- a/common/keyboard.c
+++ b/common/keyboard.c
@@ -40,6 +40,17 @@ void keyboard_init(void)
timer_init();
matrix_init();
+
+ /* boot magic keys goes here */
+ matrix_scan();
+#ifdef IS_BOOTMAGIC_BOOTLOADER
+ /* kick up bootloader */
+ if (IS_BOOTMAGIC_BOOTLOADER()) bootloader_jump();
+#endif
+#ifdef IS_BOOTMAGIC_DEBUG
+ if (IS_BOOTMAGIC_DEBUG()) debug_enable = true;
+#endif
+
#ifdef PS2_MOUSE_ENABLE
ps2_mouse_init();
#endif