mirror of
https://github.com/Fishwaldo/build.git
synced 2025-03-16 03:41:26 +00:00
7d758026b5
* Initial commit for kernel boot splash * Add startup files to disable bootlog when system is up / down * Update logo, remove deprecated one * Introduce new u-boot variable bootlogo * Adjust kernel config * Make logo possible on Odroid XU4 - add legacy and current upstream patches - delete xu4 environment since its not used * Cleanup C2,C4, both tested, logo works on mainline, - adding legacy upstream patches for c4 * Enable bootlogo by default on Odroid N2 * Enable logo on RK3399 desktop images * Cleanup the rest of the environment files * Add initrd hook that copy splash file to initrd. * Missing logo bits for one boot scripts * Enable boot logo on Pinebook A64 * Enable bootlogo on Teres * Update config
42 lines
1,004 B
Diff
42 lines
1,004 B
Diff
diff --git a/drivers/tty/vt/keyboard.c b/drivers/tty/vt/keyboard.c
|
|
index f4166263bb3a..a248429194bb 100644
|
|
--- a/drivers/tty/vt/keyboard.c
|
|
+++ b/drivers/tty/vt/keyboard.c
|
|
@@ -47,6 +47,8 @@
|
|
|
|
#include <asm/irq_regs.h>
|
|
|
|
+#include <linux/bootsplash.h>
|
|
+
|
|
extern void ctrl_alt_del(void);
|
|
|
|
/*
|
|
@@ -1353,6 +1355,28 @@ static void kbd_keycode(unsigned int keycode, int down, int hw_raw)
|
|
}
|
|
#endif
|
|
|
|
+ /* Trap keys when bootsplash is shown */
|
|
+ if (bootsplash_would_render_now()) {
|
|
+ /* Deactivate bootsplash on ESC or Alt+Fxx VT switch */
|
|
+ if (keycode >= KEY_F1 && keycode <= KEY_F12) {
|
|
+ bootsplash_disable();
|
|
+
|
|
+ /*
|
|
+ * No return here since we want to actually
|
|
+ * perform the VT switch.
|
|
+ */
|
|
+ } else {
|
|
+ if (keycode == KEY_ESC)
|
|
+ bootsplash_disable();
|
|
+
|
|
+ /*
|
|
+ * Just drop any other keys.
|
|
+ * Their effect would be hidden by the splash.
|
|
+ */
|
|
+ return;
|
|
+ }
|
|
+ }
|
|
+
|
|
if (kbd->kbdmode == VC_MEDIUMRAW) {
|
|
/*
|
|
* This is extended medium raw mode, with keys above 127
|