Seperate Workstation and Server board configurations until dual conso…

…le truely works through QubesOS gui installation. kgpe-d16 board config removed until then.
linuxboot · Oct 23, 2018 · 6226ae3 · 6226ae3
1 parent c3274b7
commit 6226ae3
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 733 deletions.
diff --git a/boards/kgpe-d16/kgpe-d16.config → boards/kgpe-d16/kgpe-d16_server.config b/boards/kgpe-d16/kgpe-d16.config → boards/kgpe-d16/kgpe-d16_server.config
@@ -1,6 +1,6 @@
 # Configuration for a kgpe-d16 running non-Qubes
 export CONFIG_COREBOOT=y
-CONFIG_COREBOOT_CONFIG=config/coreboot-kgpe-d16.config
+CONFIG_COREBOOT_CONFIG=config/coreboot-kgpe-d16_server.config
 CONFIG_LINUX_CONFIG=config/linux-kgpe-d16.config
 
 CONFIG_CRYPTSETUP=y
@@ -24,14 +24,20 @@ CONFIG_LINUX_E1000E=y
 export CONFIG_BOOTSCRIPT=/bin/generic-init
 #export CONFIG_BOOTSCRIPT_NETWORK=/bin/network-init-recovery
 
+
 #CONSOLE SELECTION
 #Single output to OpenBMC
-#export CONFIG_BOOT_KERNEL_ADD="nohz=on console=ttyS1,115200n8 "
+export CONFIG_BOOT_KERNEL_ADD="nohz=on console=ttyS1,115200n8 "
+
 #Dual output to local console (tty0) and OpenBmc (ttyS1)
-export CONFIG_BOOT_KERNEL_ADD="nohz=on console=ttyS1,115200n8 console=tty0"
+#export CONFIG_BOOT_KERNEL_ADD="nohz=on console=ttyS1,115200n8 console=tty0"
+
+#Single output to tty0
+#export CONFIG_BOOT_KERNEL_ADD="nohz=on"
 export CONFIG_BOOT_RECOVERY_SERIAL="/dev/ttyS0"
 export CONFIG_BOOT_STATIC_IP=192.168.2.3
 
+
 export CONFIG_BOOT_REQ_HASH=n
 export CONFIG_BOOT_REQ_ROLLBACK=n
 export CONFIG_BOOT_KERNEL_REMOVE=""

diff --git a/config/coreboot-kgpe-d16.config → config/coreboot-kgpe-d16_server.config b/config/coreboot-kgpe-d16.config → config/coreboot-kgpe-d16_server.config
@@ -10,5 +10,5 @@ CONFIG_COREBOOT_ROMSIZE_KB_16384=y
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 CONFIG_PAYLOAD_LINUX=y
 CONFIG_PAYLOAD_FILE="../../build/kgpe-d16/bzImage"
-CONFIG_LINUX_COMMAND_LINE="nohz=on console=ttyS1,115200n8 console=tty0 earlyprintk=ttyS1,115200"
+CONFIG_LINUX_COMMAND_LINE="nohz=on console=ttyS1,115200n8 earlyprintk=ttyS1,115200 "
 CONFIG_LINUX_INITRD="../../build/kgpe-d16/initrd.cpio.xz"