Merge branch 'master' into openslxopenslx

1 files changed, 65 insertions, 32 deletions

diff --git a/src/config/console.h b/src/config/console.h
index 9f770d094..8132e8644 100644
--- a/src/config/console.h
+++ b/src/config/console.h
@@ -11,55 +11,88 @@
  */
 
 FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
+FILE_SECBOOT ( PERMITTED );
 
 #include <config/defaults.h>
 
-/*
- * Default console types
+/*****************************************************************************
  *
- * These are all enabled by default for the appropriate platforms.
- * You may disable them if needed.
+ * Console types
  *
  */
 
-//#undef	CONSOLE_PCBIOS		/* Default BIOS console */
-//#undef	CONSOLE_EFI		/* Default EFI console */
-//#undef	CONSOLE_LINUX		/* Default Linux console */
+/* Console types supported on all platforms */
+#define CONSOLE_FRAMEBUFFER	/* Graphical framebuffer console */
+#define CONSOLE_SYSLOG		/* Syslog console */
+#define CONSOLE_SYSLOGS		/* Encrypted syslog console */
 
-/*
- * Additional console types
- *
- * These are not enabled by default, but may be useful in your
- * environment.
- *
- */
+/* Console types supported only on systems with serial ports */
+#if ! defined ( SERIAL_NULL )
+  //#define CONSOLE_SERIAL	/* Serial port console */
+#endif
+
+/* Console types supported only on BIOS platforms */
+#if defined ( PLATFORM_pcbios )
+  //#define CONSOLE_INT13	/* INT13 disk log console */
+  #define CONSOLE_PCBIOS	/* Default BIOS console */
+#endif
+
+/* Console types supported only on EFI platforms */
+#if defined ( PLATFORM_efi )
+  #define CONSOLE_EFI		/* Default EFI console */
+#endif
+
+/* Console types supported only on RISC-V SBI platforms */
+#if defined ( PLATFORM_sbi )
+  #define CONSOLE_SBI		/* RISC-V SBI debug console */
+#endif
+
+/* Console types supported only on Linux platforms */
+#if defined ( PLATFORM_linux )
+  #define CONSOLE_LINUX		/* Default Linux console */
+#endif
 
-//#define	CONSOLE_SERIAL		/* Serial port console */
-//#define	CONSOLE_FRAMEBUFFER	/* Graphical framebuffer console */
-//#define	CONSOLE_SYSLOG		/* Syslog console */
-//#define	CONSOLE_SYSLOGS		/* Encrypted syslog console */
-//#define	CONSOLE_VMWARE		/* VMware logfile console */
-//#define	CONSOLE_DEBUGCON	/* Bochs/QEMU/KVM debug port console */
-//#define	CONSOLE_INT13		/* INT13 disk log console */
+/* Console types supported only on x86 CPUs */
+#if defined ( __i386__ ) || defined ( __x86_64__ )
+  //#define CONSOLE_DEBUGCON	/* Bochs/QEMU/KVM debug port console */
+  //#define CONSOLE_DIRECT_VGA	/* Direct access to VGA card */
+  //#define CONSOLE_PC_KBD	/* Direct access to PC keyboard */
+  //#define CONSOLE_VMWARE	/* VMware logfile console */
+#endif
 
-/*
- * Very obscure console types
+/* Enable serial console on platforms that are typically headless */
+#if defined ( CONSOLE_SBI )
+  #define CONSOLE_SERIAL
+#endif
+
+/* Disable console types not historically included in BIOS builds */
+#if defined ( PLATFORM_pcbios )
+  #undef CONSOLE_FRAMEBUFFER
+  #undef CONSOLE_SYSLOG
+  #undef CONSOLE_SYSLOGS
+#endif
+
+/*****************************************************************************
  *
- * You almost certainly do not need to enable these.
+ * Keyboard maps
+ *
+ * See hci/keymap/keymap_*.c for available keyboard maps.
  *
  */
 
-//#define	CONSOLE_DIRECT_VGA	/* Direct access to VGA card */
-//#define	CONSOLE_PC_KBD		/* Direct access to PC keyboard */
-
-/* Keyboard map (available maps in hci/keymap/) */
-#define	KEYBOARD_MAP	us
+#define KEYBOARD_MAP	us	/* Default US keyboard map */
+//#define KEYBOARD_MAP	dynamic	/* Runtime selectable keyboard map */
 
-/* Control which syslog() messages are generated.
+/*****************************************************************************
+ *
+ * Log levels
+ *
+ * Control which syslog() messages are generated.  Note that this is
+ * not related in any way to CONSOLE_SYSLOG.
  *
- * Note that this is not related in any way to CONSOLE_SYSLOG.
  */
-#define	LOG_LEVEL	LOG_NONE
+
+#define LOG_LEVEL	LOG_NONE
 
 #include <config/named.h>
 #include NAMED_CONFIG(console.h)