From 5f38c715ce06335716cc5a2a00d5a1495360aa60 Mon Sep 17 00:00:00 2001 From: Thierry Laurion Date: Tue, 10 Oct 2023 11:53:35 -0400 Subject: [PATCH 1/8] coreboot config: unify quiet loglevel=2 for boards not defining default loglevel --- config/coreboot-t420-maximized.config | 2 +- config/coreboot-t420.config | 2 +- config/coreboot-t430-legacy.config | 2 +- config/coreboot-t430-maximized.config | 2 +- config/coreboot-t440p.config | 2 +- config/coreboot-t520-maximized.config | 2 +- config/coreboot-t530-dgpu-maximized.config | 2 +- config/coreboot-t530-maximized.config | 2 +- config/coreboot-w530-dgpu-K1000m-maximized.config | 2 +- config/coreboot-w530-dgpu-K2000m-maximized.config | 2 +- config/coreboot-w530-maximized.config | 2 +- config/coreboot-x220-maximized.config | 2 +- config/coreboot-x220.config | 2 +- config/coreboot-x230-legacy.config | 2 +- config/coreboot-x230-maximized-fhd_edp.config | 2 +- config/coreboot-x230-maximized.config | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/config/coreboot-t420-maximized.config b/config/coreboot-t420-maximized.config index ec95fc17e..4c99afe96 100644 --- a/config/coreboot-t420-maximized.config +++ b/config/coreboot-t420-maximized.config @@ -204,7 +204,7 @@ CONFIG_GFX_GMA_PANEL_1_PORT="LVDS" CONFIG_HEAP_SIZE=0x4000 CONFIG_EC_GPE_SCI=0x50 CONFIG_TPM_MEASURED_BOOT=y -CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet" +CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet loglevel=2" CONFIG_BOARD_ROMSIZE_KB_8192=y # CONFIG_COREBOOT_ROMSIZE_KB_256 is not set # CONFIG_COREBOOT_ROMSIZE_KB_512 is not set diff --git a/config/coreboot-t420.config b/config/coreboot-t420.config index 3401063ed..d5874773c 100644 --- a/config/coreboot-t420.config +++ b/config/coreboot-t420.config @@ -203,7 +203,7 @@ CONFIG_GFX_GMA_PANEL_1_PORT="LVDS" CONFIG_HEAP_SIZE=0x4000 CONFIG_EC_GPE_SCI=0x50 CONFIG_TPM_MEASURED_BOOT=y -CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet" +CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet loglevel=2" CONFIG_BOARD_ROMSIZE_KB_8192=y # CONFIG_COREBOOT_ROMSIZE_KB_256 is not set # CONFIG_COREBOOT_ROMSIZE_KB_512 is not set diff --git a/config/coreboot-t430-legacy.config b/config/coreboot-t430-legacy.config index b69b7661d..ec0d0ba88 100644 --- a/config/coreboot-t430-legacy.config +++ b/config/coreboot-t430-legacy.config @@ -202,7 +202,7 @@ CONFIG_GFX_GMA_PANEL_1_PORT="LVDS" CONFIG_HEAP_SIZE=0x4000 CONFIG_EC_GPE_SCI=0x50 CONFIG_TPM_MEASURED_BOOT=y -CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet" +CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet loglevel=2" CONFIG_BOARD_ROMSIZE_KB_12288=y # CONFIG_COREBOOT_ROMSIZE_KB_256 is not set # CONFIG_COREBOOT_ROMSIZE_KB_512 is not set diff --git a/config/coreboot-t430-maximized.config b/config/coreboot-t430-maximized.config index cf23f9b5d..bbe4daab0 100644 --- a/config/coreboot-t430-maximized.config +++ b/config/coreboot-t430-maximized.config @@ -204,7 +204,7 @@ CONFIG_GFX_GMA_PANEL_1_PORT="LVDS" CONFIG_HEAP_SIZE=0x4000 CONFIG_EC_GPE_SCI=0x50 CONFIG_TPM_MEASURED_BOOT=y -CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet" +CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet loglevel=2" CONFIG_BOARD_ROMSIZE_KB_12288=y # CONFIG_COREBOOT_ROMSIZE_KB_256 is not set # CONFIG_COREBOOT_ROMSIZE_KB_512 is not set diff --git a/config/coreboot-t440p.config b/config/coreboot-t440p.config index 5e27d5592..f049d44a2 100644 --- a/config/coreboot-t440p.config +++ b/config/coreboot-t440p.config @@ -202,7 +202,7 @@ CONFIG_PCIEXP_CLK_PM=y CONFIG_HEAP_SIZE=0x4000 CONFIG_EC_GPE_SCI=0x50 CONFIG_TPM_MEASURED_BOOT=y -CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet" +CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet loglevel=2" CONFIG_BOARD_ROMSIZE_KB_12288=y # CONFIG_COREBOOT_ROMSIZE_KB_256 is not set # CONFIG_COREBOOT_ROMSIZE_KB_512 is not set diff --git a/config/coreboot-t520-maximized.config b/config/coreboot-t520-maximized.config index ff5ca0be4..ee6635de3 100644 --- a/config/coreboot-t520-maximized.config +++ b/config/coreboot-t520-maximized.config @@ -205,7 +205,7 @@ CONFIG_BOARD_LENOVO_BASEBOARD_T520=y CONFIG_HEAP_SIZE=0x4000 CONFIG_EC_GPE_SCI=0x50 # CONFIG_TPM_MEASURED_BOOT is not set -CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet loglevel=3" +CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet loglevel=2" CONFIG_BOARD_ROMSIZE_KB_8192=y # CONFIG_COREBOOT_ROMSIZE_KB_256 is not set # CONFIG_COREBOOT_ROMSIZE_KB_512 is not set diff --git a/config/coreboot-t530-dgpu-maximized.config b/config/coreboot-t530-dgpu-maximized.config index 5b0026673..faaaf4fef 100644 --- a/config/coreboot-t530-dgpu-maximized.config +++ b/config/coreboot-t530-dgpu-maximized.config @@ -208,7 +208,7 @@ CONFIG_PRE_GRAPHICS_DELAY_MS=0 CONFIG_HEAP_SIZE=0x4000 CONFIG_EC_GPE_SCI=0x50 CONFIG_TPM_MEASURED_BOOT=y -CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet" +CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet loglevel=2" CONFIG_BOARD_ROMSIZE_KB_12288=y # CONFIG_COREBOOT_ROMSIZE_KB_256 is not set # CONFIG_COREBOOT_ROMSIZE_KB_512 is not set diff --git a/config/coreboot-t530-maximized.config b/config/coreboot-t530-maximized.config index ede266396..2fb739af6 100644 --- a/config/coreboot-t530-maximized.config +++ b/config/coreboot-t530-maximized.config @@ -207,7 +207,7 @@ CONFIG_BOARD_LENOVO_BASEBOARD_T530=y CONFIG_HEAP_SIZE=0x4000 CONFIG_EC_GPE_SCI=0x50 CONFIG_TPM_MEASURED_BOOT=y -CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet" +CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet loglevel=2" CONFIG_BOARD_ROMSIZE_KB_12288=y # CONFIG_COREBOOT_ROMSIZE_KB_256 is not set # CONFIG_COREBOOT_ROMSIZE_KB_512 is not set diff --git a/config/coreboot-w530-dgpu-K1000m-maximized.config b/config/coreboot-w530-dgpu-K1000m-maximized.config index d176b8db8..ce2d6db76 100644 --- a/config/coreboot-w530-dgpu-K1000m-maximized.config +++ b/config/coreboot-w530-dgpu-K1000m-maximized.config @@ -208,7 +208,7 @@ CONFIG_PRE_GRAPHICS_DELAY_MS=0 CONFIG_HEAP_SIZE=0x4000 CONFIG_EC_GPE_SCI=0x50 CONFIG_TPM_MEASURED_BOOT=y -CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet" +CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet loglevel=2" CONFIG_BOARD_ROMSIZE_KB_12288=y # CONFIG_COREBOOT_ROMSIZE_KB_256 is not set # CONFIG_COREBOOT_ROMSIZE_KB_512 is not set diff --git a/config/coreboot-w530-dgpu-K2000m-maximized.config b/config/coreboot-w530-dgpu-K2000m-maximized.config index 819482e0d..cdfc94588 100644 --- a/config/coreboot-w530-dgpu-K2000m-maximized.config +++ b/config/coreboot-w530-dgpu-K2000m-maximized.config @@ -208,7 +208,7 @@ CONFIG_PRE_GRAPHICS_DELAY_MS=0 CONFIG_HEAP_SIZE=0x4000 CONFIG_EC_GPE_SCI=0x50 CONFIG_TPM_MEASURED_BOOT=y -CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet" +CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet loglevel=2" CONFIG_BOARD_ROMSIZE_KB_12288=y # CONFIG_COREBOOT_ROMSIZE_KB_256 is not set # CONFIG_COREBOOT_ROMSIZE_KB_512 is not set diff --git a/config/coreboot-w530-maximized.config b/config/coreboot-w530-maximized.config index af307feca..18a89736e 100644 --- a/config/coreboot-w530-maximized.config +++ b/config/coreboot-w530-maximized.config @@ -207,7 +207,7 @@ CONFIG_BOARD_LENOVO_BASEBOARD_T530=y CONFIG_HEAP_SIZE=0x4000 CONFIG_EC_GPE_SCI=0x50 CONFIG_TPM_MEASURED_BOOT=y -CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet" +CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet loglevel=2" CONFIG_BOARD_ROMSIZE_KB_12288=y # CONFIG_COREBOOT_ROMSIZE_KB_256 is not set # CONFIG_COREBOOT_ROMSIZE_KB_512 is not set diff --git a/config/coreboot-x220-maximized.config b/config/coreboot-x220-maximized.config index 5f92b7e1c..2f73cdbc4 100644 --- a/config/coreboot-x220-maximized.config +++ b/config/coreboot-x220-maximized.config @@ -204,7 +204,7 @@ CONFIG_GFX_GMA_PANEL_1_PORT="LVDS" CONFIG_HEAP_SIZE=0x4000 CONFIG_EC_GPE_SCI=0x50 CONFIG_TPM_MEASURED_BOOT=y -CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet" +CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet loglevel=2" CONFIG_BOARD_ROMSIZE_KB_8192=y # CONFIG_COREBOOT_ROMSIZE_KB_256 is not set # CONFIG_COREBOOT_ROMSIZE_KB_512 is not set diff --git a/config/coreboot-x220.config b/config/coreboot-x220.config index 5f92b7e1c..2f73cdbc4 100644 --- a/config/coreboot-x220.config +++ b/config/coreboot-x220.config @@ -204,7 +204,7 @@ CONFIG_GFX_GMA_PANEL_1_PORT="LVDS" CONFIG_HEAP_SIZE=0x4000 CONFIG_EC_GPE_SCI=0x50 CONFIG_TPM_MEASURED_BOOT=y -CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet" +CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet loglevel=2" CONFIG_BOARD_ROMSIZE_KB_8192=y # CONFIG_COREBOOT_ROMSIZE_KB_256 is not set # CONFIG_COREBOOT_ROMSIZE_KB_512 is not set diff --git a/config/coreboot-x230-legacy.config b/config/coreboot-x230-legacy.config index b63b2c54a..2d58deec4 100644 --- a/config/coreboot-x230-legacy.config +++ b/config/coreboot-x230-legacy.config @@ -202,7 +202,7 @@ CONFIG_GFX_GMA_PANEL_1_PORT="LVDS" CONFIG_HEAP_SIZE=0x4000 CONFIG_EC_GPE_SCI=0x50 CONFIG_TPM_MEASURED_BOOT=y -CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet" +CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet loglevel=2" CONFIG_BOARD_ROMSIZE_KB_12288=y # CONFIG_COREBOOT_ROMSIZE_KB_256 is not set # CONFIG_COREBOOT_ROMSIZE_KB_512 is not set diff --git a/config/coreboot-x230-maximized-fhd_edp.config b/config/coreboot-x230-maximized-fhd_edp.config index e83d317d4..a86982403 100644 --- a/config/coreboot-x230-maximized-fhd_edp.config +++ b/config/coreboot-x230-maximized-fhd_edp.config @@ -204,7 +204,7 @@ CONFIG_GFX_GMA_PANEL_1_PORT="eDP" CONFIG_HEAP_SIZE=0x4000 CONFIG_EC_GPE_SCI=0x50 CONFIG_TPM_MEASURED_BOOT=y -CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet" +CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet loglevel=2" CONFIG_BOARD_ROMSIZE_KB_12288=y # CONFIG_COREBOOT_ROMSIZE_KB_256 is not set # CONFIG_COREBOOT_ROMSIZE_KB_512 is not set diff --git a/config/coreboot-x230-maximized.config b/config/coreboot-x230-maximized.config index f01397dd0..37d259dfa 100644 --- a/config/coreboot-x230-maximized.config +++ b/config/coreboot-x230-maximized.config @@ -204,7 +204,7 @@ CONFIG_GFX_GMA_PANEL_1_PORT="LVDS" CONFIG_HEAP_SIZE=0x4000 CONFIG_EC_GPE_SCI=0x50 CONFIG_TPM_MEASURED_BOOT=y -CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet" +CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet loglevel=2" CONFIG_BOARD_ROMSIZE_KB_12288=y # CONFIG_COREBOOT_ROMSIZE_KB_256 is not set # CONFIG_COREBOOT_ROMSIZE_KB_512 is not set From d3ec6ac11fa2b68a41fc1d572a998337054b3c66 Mon Sep 17 00:00:00 2001 From: Thierry Laurion Date: Tue, 10 Oct 2023 11:55:24 -0400 Subject: [PATCH 2/8] busybox: add clear reset and cttyhack to better deal with terminal mishaps --- config/busybox.config | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/config/busybox.config b/config/busybox.config index 3701311c9..6df325ba3 100644 --- a/config/busybox.config +++ b/config/busybox.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Busybox version: 1.36.1 -# Fri Jul 21 14:38:54 2023 +# Thu Oct 5 11:19:09 2023 # CONFIG_HAVE_DOT_CONFIG=y @@ -368,7 +368,7 @@ CONFIG_FEATURE_WC_LARGE=y # Console Utilities # # CONFIG_CHVT is not set -# CONFIG_CLEAR is not set +CONFIG_CLEAR=y # CONFIG_DEALLOCVT is not set # CONFIG_DUMPKMAP is not set # CONFIG_FGCONSOLE is not set @@ -381,7 +381,7 @@ CONFIG_DEFAULT_SETFONT_DIR="" # CONFIG_FEATURE_LOADFONT_RAW is not set CONFIG_LOADKMAP=y # CONFIG_OPENVT is not set -# CONFIG_RESET is not set +CONFIG_RESET=y # CONFIG_RESIZE is not set # CONFIG_FEATURE_RESIZE_PRINT is not set # CONFIG_SETCONSOLE is not set @@ -1151,7 +1151,7 @@ CONFIG_ASH_SLEEP=y CONFIG_ASH_HELP=y CONFIG_ASH_GETOPTS=y CONFIG_ASH_CMDCMD=y -# CONFIG_CTTYHACK is not set +CONFIG_CTTYHACK=y # CONFIG_HUSH is not set # CONFIG_SHELL_HUSH is not set # CONFIG_HUSH_BASH_COMPAT is not set From 0100f7b970b006ce5c28e3623ef50e279185abaa Mon Sep 17 00:00:00 2001 From: Thierry Laurion Date: Tue, 10 Oct 2023 12:03:58 -0400 Subject: [PATCH 3/8] linux configs: unify CONFIG_UNIX98_PTYS=y, CONFIG_HW_RANDOM_TPM=n, # CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER is not set, CONFIG_RANDOM_TRUST_CPU=y, CONFIG_PROC_SYSCTL is not set --- config/linux-c216.config | 6 ++--- config/linux-kgpe-d16_server-whiptail.config | 4 +-- config/linux-kgpe-d16_server.config | 4 +-- config/linux-kgpe-d16_workstation.config | 4 +-- config/linux-librem_common-6.1.8.config | 4 +-- config/linux-librem_common.config | 4 +-- config/linux-linuxboot.config | 2 +- config/linux-nitropad-x.config | 8 +++--- config/linux-qemu.config | 8 +++--- config/linux-t440p.config | 4 +-- config/linux-talos-2.config | 27 +++++++++++++------- config/linux-x230-flash.config | 8 +++--- config/linux-x230-legacy.config | 8 +++--- config/linux-x230-maximized.config | 6 ++--- 14 files changed, 52 insertions(+), 45 deletions(-) diff --git a/config/linux-c216.config b/config/linux-c216.config index 6bbe3ab5d..f14388a03 100644 --- a/config/linux-c216.config +++ b/config/linux-c216.config @@ -1375,7 +1375,7 @@ CONFIG_CONSOLE_TRANSLATIONS=y CONFIG_VT_CONSOLE=y CONFIG_HW_CONSOLE=y CONFIG_VT_HW_CONSOLE_BINDING=y -# CONFIG_UNIX98_PTYS is not set +CONFIG_UNIX98_PTYS=y # CONFIG_LEGACY_PTYS is not set # CONFIG_LDISC_AUTOLOAD is not set @@ -1443,7 +1443,7 @@ CONFIG_DEVPORT=y # CONFIG_HPET is not set # CONFIG_HANGCHECK_TIMER is not set CONFIG_TCG_TPM=y -CONFIG_HW_RANDOM_TPM=y +CONFIG_HW_RANDOM_TPM=n CONFIG_TCG_TIS_CORE=y CONFIG_TCG_TIS=y # CONFIG_TCG_TIS_I2C_ATMEL is not set @@ -1808,7 +1808,7 @@ CONFIG_DUMMY_CONSOLE_ROWS=25 CONFIG_FRAMEBUFFER_CONSOLE=y CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set -CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER=y +# CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER is not set # end of Console display driver support # CONFIG_LOGO is not set diff --git a/config/linux-kgpe-d16_server-whiptail.config b/config/linux-kgpe-d16_server-whiptail.config index 74d9f68bf..f2af51c7d 100644 --- a/config/linux-kgpe-d16_server-whiptail.config +++ b/config/linux-kgpe-d16_server-whiptail.config @@ -1474,7 +1474,7 @@ CONFIG_DEVPORT=y # CONFIG_HPET is not set # CONFIG_HANGCHECK_TIMER is not set CONFIG_TCG_TPM=y -CONFIG_HW_RANDOM_TPM=y +CONFIG_HW_RANDOM_TPM=n CONFIG_TCG_TIS_CORE=y CONFIG_TCG_TIS=y # CONFIG_TCG_TIS_I2C_ATMEL is not set @@ -1490,7 +1490,7 @@ CONFIG_TCG_TIS=y # CONFIG_XILLYBUS is not set # end of Character devices -# CONFIG_RANDOM_TRUST_CPU is not set +CONFIG_RANDOM_TRUST_CPU=y # CONFIG_RANDOM_TRUST_BOOTLOADER is not set # diff --git a/config/linux-kgpe-d16_server.config b/config/linux-kgpe-d16_server.config index 74d9f68bf..f2af51c7d 100644 --- a/config/linux-kgpe-d16_server.config +++ b/config/linux-kgpe-d16_server.config @@ -1474,7 +1474,7 @@ CONFIG_DEVPORT=y # CONFIG_HPET is not set # CONFIG_HANGCHECK_TIMER is not set CONFIG_TCG_TPM=y -CONFIG_HW_RANDOM_TPM=y +CONFIG_HW_RANDOM_TPM=n CONFIG_TCG_TIS_CORE=y CONFIG_TCG_TIS=y # CONFIG_TCG_TIS_I2C_ATMEL is not set @@ -1490,7 +1490,7 @@ CONFIG_TCG_TIS=y # CONFIG_XILLYBUS is not set # end of Character devices -# CONFIG_RANDOM_TRUST_CPU is not set +CONFIG_RANDOM_TRUST_CPU=y # CONFIG_RANDOM_TRUST_BOOTLOADER is not set # diff --git a/config/linux-kgpe-d16_workstation.config b/config/linux-kgpe-d16_workstation.config index 3acfe760c..aaf1c8faa 100644 --- a/config/linux-kgpe-d16_workstation.config +++ b/config/linux-kgpe-d16_workstation.config @@ -1474,7 +1474,7 @@ CONFIG_DEVPORT=y # CONFIG_HPET is not set # CONFIG_HANGCHECK_TIMER is not set CONFIG_TCG_TPM=y -CONFIG_HW_RANDOM_TPM=y +CONFIG_HW_RANDOM_TPM=n CONFIG_TCG_TIS_CORE=y CONFIG_TCG_TIS=y # CONFIG_TCG_TIS_I2C_ATMEL is not set @@ -1490,7 +1490,7 @@ CONFIG_TCG_TIS=y # CONFIG_XILLYBUS is not set # end of Character devices -# CONFIG_RANDOM_TRUST_CPU is not set +CONFIG_RANDOM_TRUST_CPU=y # CONFIG_RANDOM_TRUST_BOOTLOADER is not set # diff --git a/config/linux-librem_common-6.1.8.config b/config/linux-librem_common-6.1.8.config index 59ffef787..0dc89610a 100644 --- a/config/linux-librem_common-6.1.8.config +++ b/config/linux-librem_common-6.1.8.config @@ -141,7 +141,6 @@ CONFIG_E1000E=m # CONFIG_WLAN is not set # CONFIG_INPUT_MOUSE is not set # CONFIG_SERIO_SERPORT is not set -# CONFIG_UNIX98_PTYS is not set # CONFIG_LEGACY_PTYS is not set CONFIG_SERIAL_8250=y # CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set @@ -152,12 +151,11 @@ CONFIG_SERIAL_8250=y CONFIG_TTY_PRINTK=y CONFIG_HW_RANDOM=y CONFIG_HW_RANDOM_TIMERIOMEM=m -CONFIG_HW_RANDOM_INTEL=m CONFIG_HW_RANDOM_AMD=m CONFIG_HW_RANDOM_VIA=m CONFIG_TCG_TPM=y +# CONFIG_HW_RANDOM_TPM is not set CONFIG_TCG_TIS=y -# CONFIG_RANDOM_TRUST_CPU is not set # CONFIG_RANDOM_TRUST_BOOTLOADER is not set # CONFIG_HWMON is not set # CONFIG_X86_PKG_TEMP_THERMAL is not set diff --git a/config/linux-librem_common.config b/config/linux-librem_common.config index c0a104471..c201f9716 100644 --- a/config/linux-librem_common.config +++ b/config/linux-librem_common.config @@ -1385,7 +1385,7 @@ CONFIG_CONSOLE_TRANSLATIONS=y CONFIG_VT_CONSOLE=y CONFIG_HW_CONSOLE=y CONFIG_VT_HW_CONSOLE_BINDING=y -# CONFIG_UNIX98_PTYS is not set +CONFIG_UNIX98_PTYS=y # CONFIG_LEGACY_PTYS is not set CONFIG_LDISC_AUTOLOAD=y @@ -1453,7 +1453,7 @@ CONFIG_DEVPORT=y # CONFIG_HPET is not set # CONFIG_HANGCHECK_TIMER is not set CONFIG_TCG_TPM=y -CONFIG_HW_RANDOM_TPM=y +CONFIG_HW_RANDOM_TPM=n CONFIG_TCG_TIS_CORE=y CONFIG_TCG_TIS=y # CONFIG_TCG_TIS_I2C_ATMEL is not set diff --git a/config/linux-linuxboot.config b/config/linux-linuxboot.config index a6e05240d..0ff8541bb 100644 --- a/config/linux-linuxboot.config +++ b/config/linux-linuxboot.config @@ -206,7 +206,7 @@ CONFIG_SERIAL_8250_EXTENDED=y CONFIG_TTY_PRINTK=y CONFIG_HW_RANDOM=y CONFIG_HW_RANDOM_TIMERIOMEM=m -CONFIG_HW_RANDOM_INTEL=m +CONFIG_HW_RANDOM_INTEL=y CONFIG_HW_RANDOM_AMD=m CONFIG_HW_RANDOM_VIA=m CONFIG_HW_RANDOM_TPM=m diff --git a/config/linux-nitropad-x.config b/config/linux-nitropad-x.config index 2f77a1335..a82c42a2d 100644 --- a/config/linux-nitropad-x.config +++ b/config/linux-nitropad-x.config @@ -15,7 +15,7 @@ CONFIG_CC_CAN_LINK=y CONFIG_CC_CAN_LINK_STATIC=y CONFIG_CC_HAS_ASM_INLINE=y CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y -CONFIG_PAHOLE_VERSION=125 +CONFIG_PAHOLE_VERSION=0 CONFIG_IRQ_WORK=y CONFIG_BUILDTIME_TABLE_SORT=y CONFIG_THREAD_INFO_IN_TASK=y @@ -1483,7 +1483,7 @@ CONFIG_CONSOLE_TRANSLATIONS=y CONFIG_VT_CONSOLE=y CONFIG_HW_CONSOLE=y CONFIG_VT_HW_CONSOLE_BINDING=y -# CONFIG_UNIX98_PTYS is not set +CONFIG_UNIX98_PTYS=y # CONFIG_LEGACY_PTYS is not set CONFIG_LDISC_AUTOLOAD=y @@ -1535,7 +1535,7 @@ CONFIG_TTY_PRINTK_LEVEL=6 # CONFIG_IPMB_DEVICE_INTERFACE is not set CONFIG_HW_RANDOM=y CONFIG_HW_RANDOM_TIMERIOMEM=m -CONFIG_HW_RANDOM_INTEL=m +CONFIG_HW_RANDOM_INTEL=y CONFIG_HW_RANDOM_AMD=m # CONFIG_HW_RANDOM_BA431 is not set CONFIG_HW_RANDOM_VIA=m @@ -1548,7 +1548,7 @@ CONFIG_DEVPORT=y # CONFIG_HPET is not set # CONFIG_HANGCHECK_TIMER is not set CONFIG_TCG_TPM=y -CONFIG_HW_RANDOM_TPM=y +CONFIG_HW_RANDOM_TPM=n CONFIG_TCG_TIS_CORE=y CONFIG_TCG_TIS=y # CONFIG_TCG_TIS_I2C is not set diff --git a/config/linux-qemu.config b/config/linux-qemu.config index 88017b237..6d76042e9 100644 --- a/config/linux-qemu.config +++ b/config/linux-qemu.config @@ -353,7 +353,7 @@ CONFIG_MICROCODE_INTEL=y CONFIG_MICROCODE_AMD=y # CONFIG_MICROCODE_OLD_INTERFACE is not set CONFIG_X86_MSR=y -# CONFIG_X86_CPUID is not set +CONFIG_X86_CPUID=y # CONFIG_X86_5LEVEL is not set CONFIG_X86_DIRECT_GBPAGES=y # CONFIG_X86_CPA_STATISTICS is not set @@ -1471,7 +1471,7 @@ CONFIG_CONSOLE_TRANSLATIONS=y CONFIG_VT_CONSOLE=y CONFIG_HW_CONSOLE=y CONFIG_VT_HW_CONSOLE_BINDING=y -# CONFIG_UNIX98_PTYS is not set +CONFIG_UNIX98_PTYS=y # CONFIG_LEGACY_PTYS is not set # CONFIG_LDISC_AUTOLOAD is not set @@ -1535,7 +1535,7 @@ CONFIG_HW_RANDOM_INTEL=y CONFIG_HW_RANDOM_AMD=y # CONFIG_HW_RANDOM_BA431 is not set # CONFIG_HW_RANDOM_VIA is not set -# CONFIG_HW_RANDOM_VIRTIO is not set +CONFIG_HW_RANDOM_VIRTIO=y # CONFIG_HW_RANDOM_XIPHERA is not set # CONFIG_APPLICOM is not set # CONFIG_MWAVE is not set @@ -1547,7 +1547,7 @@ CONFIG_DEVPORT=y # CONFIG_HPET is not set # CONFIG_HANGCHECK_TIMER is not set CONFIG_TCG_TPM=y -CONFIG_HW_RANDOM_TPM=y +CONFIG_HW_RANDOM_TPM=n CONFIG_TCG_TIS_CORE=y CONFIG_TCG_TIS=y CONFIG_TCG_TIS_I2C_ATMEL=y diff --git a/config/linux-t440p.config b/config/linux-t440p.config index 86dbe8c97..a2f91abc2 100644 --- a/config/linux-t440p.config +++ b/config/linux-t440p.config @@ -1405,7 +1405,7 @@ CONFIG_CONSOLE_TRANSLATIONS=y CONFIG_VT_CONSOLE=y CONFIG_HW_CONSOLE=y CONFIG_VT_HW_CONSOLE_BINDING=y -# CONFIG_UNIX98_PTYS is not set +CONFIG_UNIX98_PTYS=y # CONFIG_LEGACY_PTYS is not set CONFIG_LDISC_AUTOLOAD=y @@ -1473,7 +1473,7 @@ CONFIG_DEVPORT=y # CONFIG_HPET is not set # CONFIG_HANGCHECK_TIMER is not set CONFIG_TCG_TPM=y -CONFIG_HW_RANDOM_TPM=y +CONFIG_HW_RANDOM_TPM=n CONFIG_TCG_TIS_CORE=y CONFIG_TCG_TIS=y # CONFIG_TCG_TIS_I2C_ATMEL is not set diff --git a/config/linux-talos-2.config b/config/linux-talos-2.config index 9c1fabadd..b3f678497 100644 --- a/config/linux-talos-2.config +++ b/config/linux-talos-2.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/powerpc 5.5.0 Kernel Configuration +# Linux/powerpc 5.5.0-openpower1 Kernel Configuration # # @@ -32,9 +32,7 @@ CONFIG_KERNEL_GZIP=y CONFIG_DEFAULT_HOSTNAME="(none)" # CONFIG_SWAP is not set CONFIG_SYSVIPC=y -CONFIG_SYSVIPC_SYSCTL=y CONFIG_POSIX_MQUEUE=y -CONFIG_POSIX_MQUEUE_SYSCTL=y # CONFIG_CROSS_MEMORY_ATTACH is not set # CONFIG_USELIB is not set # CONFIG_AUDIT is not set @@ -141,7 +139,6 @@ CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set CONFIG_HAVE_LD_DEAD_CODE_DATA_ELIMINATION=y # CONFIG_LD_DEAD_CODE_DATA_ELIMINATION is not set -CONFIG_SYSCTL=y CONFIG_SYSCTL_EXCEPTION_TRACE=y CONFIG_BPF=y CONFIG_EXPERT=y @@ -415,6 +412,19 @@ CONFIG_ARCH_RANDOM=y # CONFIG_VIRTUALIZATION is not set CONFIG_HAVE_LIVEPATCH=y +# +# Firmware Drivers +# +# CONFIG_FIRMWARE_MEMMAP is not set +# CONFIG_GOOGLE_FIRMWARE is not set +CONFIG_EFI_EARLYCON=y + +# +# Tegra firmware driver +# +# end of Tegra firmware driver +# end of Firmware Drivers + # # General architecture-dependent options # @@ -486,6 +496,7 @@ CONFIG_ARCH_OPTIONAL_KERNEL_RWX=y CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y CONFIG_STRICT_KERNEL_RWX=y CONFIG_ARCH_HAS_PHYS_TO_DMA=y +CONFIG_ARCH_USE_MEMREMAP_PROT=y # CONFIG_LOCK_EVENT_COUNTS is not set # @@ -1481,7 +1492,7 @@ CONFIG_NVRAM=y # CONFIG_RAW_DRIVER is not set # CONFIG_HANGCHECK_TIMER is not set CONFIG_TCG_TPM=y -CONFIG_HW_RANDOM_TPM=y +CONFIG_HW_RANDOM_TPM=n # CONFIG_TCG_TIS is not set # CONFIG_TCG_TIS_I2C_ATMEL is not set CONFIG_TCG_TIS_I2C_INFINEON=y @@ -1493,7 +1504,7 @@ CONFIG_DEVPORT=y # CONFIG_XILLYBUS is not set # end of Character devices -# CONFIG_RANDOM_TRUST_CPU is not set +CONFIG_RANDOM_TRUST_CPU=y # CONFIG_RANDOM_TRUST_BOOTLOADER is not set # @@ -2702,7 +2713,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" # CONFIG_PROC_FS=y CONFIG_PROC_KCORE=y -CONFIG_PROC_SYSCTL=y +# CONFIG_PROC_SYSCTL is not set CONFIG_PROC_PAGE_MONITOR=y # CONFIG_PROC_CHILDREN is not set CONFIG_KERNFS=y @@ -2786,7 +2797,6 @@ CONFIG_NFS_COMMON=y CONFIG_SUNRPC=y CONFIG_SUNRPC_GSS=y CONFIG_SUNRPC_BACKCHANNEL=y -# CONFIG_SUNRPC_DEBUG is not set # CONFIG_CEPH_FS is not set # CONFIG_CIFS is not set # CONFIG_CODA_FS is not set @@ -3394,7 +3404,6 @@ CONFIG_RUNTIME_TESTING_MENU=y # CONFIG_TEST_BLACKHOLE_DEV is not set # CONFIG_FIND_BIT_BENCHMARK is not set # CONFIG_TEST_FIRMWARE is not set -# CONFIG_TEST_SYSCTL is not set # CONFIG_TEST_UDELAY is not set # CONFIG_TEST_STATIC_KEYS is not set # CONFIG_TEST_MEMCAT_P is not set diff --git a/config/linux-x230-flash.config b/config/linux-x230-flash.config index cadc29377..11959504f 100644 --- a/config/linux-x230-flash.config +++ b/config/linux-x230-flash.config @@ -1071,7 +1071,7 @@ CONFIG_CONSOLE_TRANSLATIONS=y CONFIG_VT_CONSOLE=y CONFIG_HW_CONSOLE=y CONFIG_VT_HW_CONSOLE_BINDING=y -# CONFIG_UNIX98_PTYS is not set +CONFIG_UNIX98_PTYS=y # CONFIG_LEGACY_PTYS is not set # CONFIG_LDISC_AUTOLOAD is not set @@ -1138,7 +1138,7 @@ CONFIG_DEVPORT=y # CONFIG_HPET is not set # CONFIG_HANGCHECK_TIMER is not set CONFIG_TCG_TPM=y -CONFIG_HW_RANDOM_TPM=y +CONFIG_HW_RANDOM_TPM=n CONFIG_TCG_TIS_CORE=y CONFIG_TCG_TIS=y # CONFIG_TCG_TIS_I2C_ATMEL is not set @@ -1501,7 +1501,7 @@ CONFIG_DUMMY_CONSOLE_ROWS=25 CONFIG_FRAMEBUFFER_CONSOLE=y CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set -CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER=y +# CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER is not set # end of Console display driver support # CONFIG_LOGO is not set @@ -2128,7 +2128,7 @@ CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8" # CONFIG_PROC_FS=y # CONFIG_PROC_KCORE is not set -# CONFIG_PROC_SYSCTL is not set + # CONFIG_PROC_PAGE_MONITOR is not set # CONFIG_PROC_CHILDREN is not set CONFIG_PROC_PID_ARCH_STATUS=y diff --git a/config/linux-x230-legacy.config b/config/linux-x230-legacy.config index 49bff765d..32fcc31c6 100644 --- a/config/linux-x230-legacy.config +++ b/config/linux-x230-legacy.config @@ -1181,7 +1181,7 @@ CONFIG_CONSOLE_TRANSLATIONS=y CONFIG_VT_CONSOLE=y CONFIG_HW_CONSOLE=y CONFIG_VT_HW_CONSOLE_BINDING=y -# CONFIG_UNIX98_PTYS is not set +CONFIG_UNIX98_PTYS=y # CONFIG_LEGACY_PTYS is not set # CONFIG_LDISC_AUTOLOAD is not set @@ -1249,7 +1249,7 @@ CONFIG_DEVPORT=y # CONFIG_HPET is not set # CONFIG_HANGCHECK_TIMER is not set CONFIG_TCG_TPM=y -CONFIG_HW_RANDOM_TPM=y +CONFIG_HW_RANDOM_TPM=n CONFIG_TCG_TIS_CORE=y CONFIG_TCG_TIS=y # CONFIG_TCG_TIS_I2C_ATMEL is not set @@ -1614,7 +1614,7 @@ CONFIG_DUMMY_CONSOLE_ROWS=25 CONFIG_FRAMEBUFFER_CONSOLE=y CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set -CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER=y +# CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER is not set # end of Console display driver support # CONFIG_LOGO is not set @@ -2242,7 +2242,7 @@ CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8" # CONFIG_PROC_FS=y # CONFIG_PROC_KCORE is not set -# CONFIG_PROC_SYSCTL is not set + # CONFIG_PROC_PAGE_MONITOR is not set # CONFIG_PROC_CHILDREN is not set CONFIG_PROC_PID_ARCH_STATUS=y diff --git a/config/linux-x230-maximized.config b/config/linux-x230-maximized.config index a25a42986..2853274d9 100644 --- a/config/linux-x230-maximized.config +++ b/config/linux-x230-maximized.config @@ -1372,7 +1372,7 @@ CONFIG_CONSOLE_TRANSLATIONS=y CONFIG_VT_CONSOLE=y CONFIG_HW_CONSOLE=y CONFIG_VT_HW_CONSOLE_BINDING=y -# CONFIG_UNIX98_PTYS is not set +CONFIG_UNIX98_PTYS=y # CONFIG_LEGACY_PTYS is not set # CONFIG_LDISC_AUTOLOAD is not set @@ -1440,7 +1440,7 @@ CONFIG_DEVPORT=y # CONFIG_HPET is not set # CONFIG_HANGCHECK_TIMER is not set CONFIG_TCG_TPM=y -CONFIG_HW_RANDOM_TPM=y +# CONFIG_HW_RANDOM_TPM is not set CONFIG_TCG_TIS_CORE=y CONFIG_TCG_TIS=y # CONFIG_TCG_TIS_I2C_ATMEL is not set @@ -1805,7 +1805,7 @@ CONFIG_DUMMY_CONSOLE_ROWS=25 CONFIG_FRAMEBUFFER_CONSOLE=y CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set -CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER=y +# CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER is not set # end of Console display driver support # CONFIG_LOGO is not set From 84899cf631614e5f82c849e10ea6b5ccbff499db Mon Sep 17 00:00:00 2001 From: Thierry Laurion Date: Tue, 10 Oct 2023 12:06:18 -0400 Subject: [PATCH 4/8] libgcrypt module: remove disable-asm As on master otherwise with --disable-asm: config.status: executing gcrypt-conf commands Libgcrypt v1.10.1 has been configured as follows: Platform: GNU/Linux (x86_64-pc-linux-musl) Hardware detection module: none Enabled cipher algorithms: arcfour blowfish cast5 des aes twofish serpent rfc2268 seed camellia idea salsa20 gost28147 chacha20 sm4 Enabled digest algorithms: crc gostr3411-94 md4 md5 rmd160 sha1 sha256 sha512 sha3 tiger whirlpool stribog blake2 sm3 Enabled kdf algorithms: s2k pkdf2 scrypt Enabled pubkey algorithms: dsa elgamal rsa ecc Random number generator: default Try using jitter entropy: yes Using linux capabilities: no FIPS module version: Try using Padlock crypto: n/a Try using AES-NI crypto: n/a Try using Intel SHAEXT: n/a Try using Intel PCLMUL: n/a Try using Intel SSE4.1: n/a Try using DRNG (RDRAND): n/a Try using Intel AVX: n/a Try using Intel AVX2: n/a Try using ARM NEON: n/a Try using ARMv8 crypto: n/a Try using PPC crypto: n/a By disabling --disable-asm in libgcrypt 1.10.1: config.status: executing gcrypt-conf commands Libgcrypt v1.10.1 has been configured as follows: Platform: GNU/Linux (x86_64-pc-linux-musl) Hardware detection module: libgcrypt_la-hwf-x86 Enabled cipher algorithms: arcfour blowfish cast5 des aes twofish serpent rfc2268 seed camellia idea salsa20 gost28147 chacha20 sm4 Enabled digest algorithms: crc gostr3411-94 md4 md5 rmd160 sha1 sha256 sha512 sha3 tiger whirlpool stribog blake2 sm3 Enabled kdf algorithms: s2k pkdf2 scrypt Enabled pubkey algorithms: dsa elgamal rsa ecc Random number generator: default Enabled digest algorithms: crc gostr3411-94 md4 md5 rmd160 sha1 sha256 sha512 sha3 tiger whirlpool stribog blake2 sm3 Enabled kdf algorithms: s2k pkdf2 scrypt Enabled pubkey algorithms: dsa elgamal rsa ecc Random number generator: default Try using jitter entropy: yes Using linux capabilities: no FIPS module version: Try using Padlock crypto: yes Try using AES-NI crypto: yes Try using Intel SHAEXT: yes Try using Intel PCLMUL: yes Try using Intel SSE4.1: yes Try using DRNG (RDRAND): yes Try using Intel AVX: yes Try using Intel AVX2: yes Try using ARM NEON: n/a Try using ARMv8 crypto: n/a Try using PPC crypto: n/a To support PPC crypto, it seems we will need yasm. To support linux capabilities, libcap would be required as well later on. :/ another point for rng-tools (which also depends on libcap-ng) --- modules/libgcrypt | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/libgcrypt b/modules/libgcrypt index 0df0bdfca..c46fe6085 100644 --- a/modules/libgcrypt +++ b/modules/libgcrypt @@ -14,7 +14,6 @@ libgcrypt_configure := \ --prefix "/" \ --disable-static \ --with-gpg-error-prefix="$(INSTALL)" \ - --disable-asm \ --disable-doc \ libgcrypt_target := $(MAKE_JOBS) \ From 4ff955918fcd8a50d787603d109a4fccb2adfd88 Mon Sep 17 00:00:00 2001 From: Thierry Laurion Date: Tue, 10 Oct 2023 12:14:28 -0400 Subject: [PATCH 5/8] x230-maximized board configs: add DEBUG/TRACE board config in comment Enabling DEBUG/TRACE options from board config vs from configuration menu is different. When enabled in board config, /etc/config is from ROM, and sourced early and make TRACE/DEBUG calls appear early. If added through configuration menu, those are /etc/config.user overrides extracted from CBFS and then sourced after combine_configs call If for whatever reason early DEBUG is needed on a platform, enabling in board config is needed. For runtime debugging, enabling Debug output from configuration menu is enough --- boards/x230-hotp-maximized/x230-hotp-maximized.config | 4 ++++ boards/x230-maximized/x230-maximized.config | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/boards/x230-hotp-maximized/x230-hotp-maximized.config b/boards/x230-hotp-maximized/x230-hotp-maximized.config index f6a6e30cb..68c72a377 100644 --- a/boards/x230-hotp-maximized/x230-hotp-maximized.config +++ b/boards/x230-hotp-maximized/x230-hotp-maximized.config @@ -13,6 +13,10 @@ export CONFIG_LINUX_VERSION=5.10.5 CONFIG_COREBOOT_CONFIG=config/coreboot-x230-maximized.config CONFIG_LINUX_CONFIG=config/linux-x230-maximized.config +#Enable DEBUG output +#export CONFIG_DEBUG_OUTPUT=y +#export CONFIG_ENABLE_FUNCTION_TRACING_OUTPUT=y + #Additional hardware support CONFIG_LINUX_USB=y CONFIG_LINUX_E1000E=y diff --git a/boards/x230-maximized/x230-maximized.config b/boards/x230-maximized/x230-maximized.config index a122bd654..4afe8e129 100644 --- a/boards/x230-maximized/x230-maximized.config +++ b/boards/x230-maximized/x230-maximized.config @@ -13,6 +13,10 @@ export CONFIG_LINUX_VERSION=5.10.5 CONFIG_COREBOOT_CONFIG=config/coreboot-x230-maximized.config CONFIG_LINUX_CONFIG=config/linux-x230-maximized.config +#Enable DEBUG output +#export CONFIG_DEBUG_OUTPUT=y +#export CONFIG_ENABLE_FUNCTION_TRACING_OUTPUT=y + #Additional hardware support CONFIG_LINUX_USB=y CONFIG_LINUX_E1000E=y From 0416896b823ca0f2314e1d0bd89f708d34ac00eb Mon Sep 17 00:00:00 2001 From: Thierry Laurion Date: Tue, 10 Oct 2023 12:28:15 -0400 Subject: [PATCH 6/8] etc/ash_function's warn/die/TRACE/DEBUG now output also under /dev/kmsg when DEBUG is enabled --- initrd/etc/ash_functions | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/initrd/etc/ash_functions b/initrd/etc/ash_functions index c62c62c9e..768d4627e 100644 --- a/initrd/etc/ash_functions +++ b/initrd/etc/ash_functions @@ -4,26 +4,34 @@ # busybox ash on legacy-flash boards, and with bash on all other boards. die() { - echo >&2 " !!! ERROR: $* !!!"; + if [ "$CONFIG_DEBUG_OUTPUT" = "y" ];then + echo " !!! ERROR: $* !!!" | tee -a /tmp/debug.log /dev/kmsg > /dev/null; + else + echo >&2 "!!! ERROR: $* !!!"; + fi sleep 2; exit 1; } warn() { - echo >&2 " *** WARNING: $* ***"; + if [ "$CONFIG_DEBUG_OUTPUT" = "y" ];then + echo " *** WARNING: $* ***" | tee -a /tmp/debug.log /dev/kmsg > /dev/null; + else + echo >&2 " *** WARNING: $* ***"; + fi sleep 1; } DEBUG() { if [ "$CONFIG_DEBUG_OUTPUT" = "y" ];then - echo "DEBUG: $*" | tee -a /tmp/debug.log >&2; + echo "DEBUG: $*" | tee -a /tmp/debug.log /dev/kmsg > /dev/null; fi } TRACE() { - if [ "$CONFIG_ENABLE_FUNCTION_TRACING_OUTPUT" = "y" ];then - echo "TRACE: $*" | tee -a /tmp/debug.log >&2; - fi + if [ "$CONFIG_ENABLE_FUNCTION_TRACING_OUTPUT" = "y" ];then + echo "TRACE: $*" | tee -a /tmp/debug.log /dev/kmsg > /dev/null; + fi } preserve_rom() { From 65e5286b5aeeaafbdfafa68ae5e3606af6c9b848 Mon Sep 17 00:00:00 2001 From: Thierry Laurion Date: Tue, 10 Oct 2023 12:28:52 -0400 Subject: [PATCH 7/8] init: enable cttyhack so that init launches BOOTSCRIPT in a controlled terminal. DEBUG/TRACE now output on /dev/kmsg and console. --- initrd/init | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/initrd/init b/initrd/init index 17dc1c571..2acd93fed 100755 --- a/initrd/init +++ b/initrd/init @@ -53,6 +53,15 @@ hwclock -l -s . /etc/ash_functions . /etc/config +# Board config had CONFIG_DEBUG_OUTPUT=y defined. +# Note that boards's coreboot config kernel command line "debug" option only will have all kernel messages output on console prior of this point +if [ "$CONFIG_DEBUG_OUTPUT" = "y" ]; then + #Maximize printk messages to output all to console (8=debug) + #DEBUG and TRACE calls will output to /dev/kmsg, outputting both on dmesg and on console + dmesg -n 8 || true + DEBUG "Debug output enabled from board CONFIG_DEBUG_OUTPUT=y option (/etc/config)" +fi + TRACE "Under init" # set CONFIG_TPM dynamically before init @@ -85,6 +94,7 @@ fi # Set GPG_TTY before calling gpg in key-init export GPG_TTY=/dev/console +# Initialize gpnupg with distro/user keys and setup the keyrings [ -x /bin/bash ] && /bin/key-init # Override CONFIG_USE_BLOB_JAIL if needed and persist via user config @@ -109,6 +119,20 @@ sed -i -e 's/^export CONFIG_PUREBOOT_BASIC=/export CONFIG_BASIC=/g' /etc/config. combine_configs . /tmp/config +# Enable maximum debug info from here if config.user extracted and combined from CBFS had CONFIG_DEBUG_OUTPUT=y +if [ "$CONFIG_DEBUG_OUTPUT" = "y" ]; then + #Output all kernel messages to console (8=debug) + #DEBUG and TRACE calls will be in dmesg and on console + if ! grep -q 'CONFIG_DEBUG_OUTPUT="y"' /etc/config;then + # Board config did't have CONFIG_DEBUG_OUTPUT=y defined + # config.user extracted and combined from CBFS had CONFIG_DEBUG_OUTPUT=y + dmesg -n 8 + DEBUG "Debug output enabled from /etc/config.user's CONFIG_DEBUG_OUTPUT=y after combine_configs (Config menu enabled Debug)" + TRACE "Under init:after combine_configs" + fi +fi + + # Setup recovery serial shell if [ ! -z "$CONFIG_BOOT_RECOVERY_SERIAL" ]; then stty -F "$CONFIG_BOOT_RECOVERY_SERIAL" 115200 @@ -184,8 +208,9 @@ else setsid agetty -aroot -l"$CONFIG_BOOTSCRIPT" "$console" linux & done fi - - exec "$CONFIG_BOOTSCRIPT" + + #Setup a control tty so that all terminals outputs correct tty when tty is called + exec cttyhack "$CONFIG_BOOTSCRIPT" else # wait for boot via network to occur pause_recovery 'Override network boot. Entering recovery shell' From 9addb3b6b002d64eff4a875b35eb001a3dc67a87 Mon Sep 17 00:00:00 2001 From: Thierry Laurion Date: Tue, 10 Oct 2023 12:30:41 -0400 Subject: [PATCH 8/8] qemu board doc: add Nitrokey3NFC in md doc --- .../qemu-coreboot-fbwhiptail-tpm1-hotp.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/boards/qemu-coreboot-fbwhiptail-tpm1-hotp/qemu-coreboot-fbwhiptail-tpm1-hotp.md b/boards/qemu-coreboot-fbwhiptail-tpm1-hotp/qemu-coreboot-fbwhiptail-tpm1-hotp.md index 8781174fe..59ed50fe2 100644 --- a/boards/qemu-coreboot-fbwhiptail-tpm1-hotp/qemu-coreboot-fbwhiptail-tpm1-hotp.md +++ b/boards/qemu-coreboot-fbwhiptail-tpm1-hotp/qemu-coreboot-fbwhiptail-tpm1-hotp.md @@ -32,6 +32,7 @@ Bootstrapping a working system * For ``, use one of: * `NitrokeyPro` - a Nitrokey Pro by VID/PID * `NitrokeyStorage` - a Nitrokey Storage by VID/PID + * `Nitrokey3NFC` - a Nitrokey 3 by VID:PID * `LibremKey` - a Librem Key by VID/PID * `hostbus=#,hostport=#` - indicate a host bus and port (see qemu usb-host) * `vendorid=#,productid=#` - indicate a device by VID/PID (decimal, see qemu usb-host) @@ -40,7 +41,7 @@ Bootstrapping a working system * Then Heads will indicate that there is no TOTP code yet, at this point shut down (Continue to main menu -> Power off) 5. Get the public key that was saved to the virtual USB flash drive * `sudo mkdir /media/fd_heads_gpg` - * `sudo mount ./build/qemu-coreboot-fbwhiptail-tpm1-hotp/usb_fd.raw /media/fd_heads_gpg` + * `sudo mount ./build/x86/qemu-coreboot-fbwhiptail-tpm1-hotp/usb_fd.raw /media/fd_heads_gpg` * Look in `/media/fd_heads_gpg` and copy the most recent public key * `sudo umount /media/fd_heads_gpg` 6. Inject the GPG key into the Heads image and run again