Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rel novacustom nv4x adl v0.9.1 #11

Open
wants to merge 8 commits into
base: dasharo
Choose a base branch
from
Open

Rel novacustom nv4x adl v0.9.1 #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4e34cc0
ash_functions: move sleep 2 after all usb modules being loaded
tlaurion Apr 12, 2024
3d611af
bump hotp version to 1.6
nestire May 21, 2024
7015e6e
extent hotp error message for nitrokeys
nestire May 21, 2024
0fb3886
nitropad-nx: use standard shutdown/reboot commands
macpijan Jun 20, 2024
f49ec86
site-local/config: bump to v0.9.1
macpijan Jun 20, 2024
a9395ca
1692 Update text for TPM Primary Handle error with correct remediatio…
mdrobnak Jun 3, 2024
7c3c3cf
nitropad: drop iotools
macpijan Jun 21, 2024
0af2459
config/coreboot-nitropad-n[v41,s50].config: disable power on AC
mkopec Apr 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions boards/nitropad-ns50/nitropad-ns50.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@ CONFIG_GPG2=y
CONFIG_LVM2=y
CONFIG_MBEDTLS=y

CONFIG_IOTOOLS=y

CONFIG_DROPBEAR=y

CONFIG_MSRTOOLS=y
Expand Down
2 changes: 0 additions & 2 deletions boards/nitropad-nv41/nitropad-nv41.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@ CONFIG_GPG2=y
CONFIG_LVM2=y
CONFIG_MBEDTLS=y

CONFIG_IOTOOLS=y

CONFIG_DROPBEAR=y

CONFIG_MSRTOOLS=y
Expand Down
6 changes: 3 additions & 3 deletions config/coreboot-nitropad-ns50.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,10 +214,10 @@ CONFIG_COREBOOT_ROMSIZE_KB=32768
CONFIG_ROM_SIZE=0x02000000
CONFIG_HAVE_POWER_STATE_AFTER_FAILURE=y
CONFIG_HAVE_POWER_STATE_PREVIOUS_AFTER_FAILURE=y
# CONFIG_POWER_STATE_OFF_AFTER_FAILURE is not set
CONFIG_POWER_STATE_ON_AFTER_FAILURE=y
CONFIG_POWER_STATE_OFF_AFTER_FAILURE=y
# CONFIG_POWER_STATE_ON_AFTER_FAILURE is not set
# CONFIG_POWER_STATE_PREVIOUS_AFTER_FAILURE is not set
CONFIG_MAINBOARD_POWER_FAILURE_STATE=1
CONFIG_MAINBOARD_POWER_FAILURE_STATE=0
# end of Mainboard

CONFIG_SYSTEM_TYPE_LAPTOP=y
Expand Down
6 changes: 3 additions & 3 deletions config/coreboot-nitropad-nv41.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,10 +213,10 @@ CONFIG_COREBOOT_ROMSIZE_KB=32768
CONFIG_ROM_SIZE=0x02000000
CONFIG_HAVE_POWER_STATE_AFTER_FAILURE=y
CONFIG_HAVE_POWER_STATE_PREVIOUS_AFTER_FAILURE=y
# CONFIG_POWER_STATE_OFF_AFTER_FAILURE is not set
CONFIG_POWER_STATE_ON_AFTER_FAILURE=y
CONFIG_POWER_STATE_OFF_AFTER_FAILURE=y
#CONFIG_POWER_STATE_ON_AFTER_FAILURE is not set
# CONFIG_POWER_STATE_PREVIOUS_AFTER_FAILURE is not set
CONFIG_MAINBOARD_POWER_FAILURE_STATE=1
CONFIG_MAINBOARD_POWER_FAILURE_STATE=0
# end of Mainboard

CONFIG_SYSTEM_TYPE_LAPTOP=y
Expand Down
4 changes: 3 additions & 1 deletion initrd/bin/kexec-select-boot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,9 @@ if [ "$CONFIG_TPM2_TOOLS" = "y" ]; then
}
else
warn "Hash of TPM2 primary key handle does not exist"
warn "Please rebuild the boot hash tree"
warn "Please rebuild the TPM2 primary key handle by settings a default OS to boot."
warn "Select Options-> Boot Options -> Show OS Boot Menu -> <Pick OS> -> Make default"
#TODO: Simplify/Automatize TPM2 firmware upgrade process. Today: upgrade, reboot, reseal(type TPM owner pass), resign, boot
default_failed="y"
DEBUG "Hash of TPM2 primary key handle does not exist under $PRIMHASH_FILE"
fi
Expand Down
36 changes: 0 additions & 36 deletions initrd/bin/nitropad-shutdown.sh
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions initrd/bin/poweroff
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,6 @@ if [ "$CONFIG_TPM" = "y" ]; then
tpmr shutdown
fi

# Run special EC-based poweroff for Nitropad-Nxx
if [ "$CONFIG_BOARD" = "nitropad-nv41" ] || [ "$CONFIG_BOARD" = "nitropad-ns50" ]; then
/bin/nitropad-shutdown.sh
fi

# Sync all mounted filesystems
echo s > /proc/sysrq-trigger

Expand Down
5 changes: 0 additions & 5 deletions initrd/bin/reboot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,6 @@ if [ "$CONFIG_TPM" = "y" ]; then
tpmr shutdown
fi

# Run special EC-based poweroff for Nitropad-Nxx
if [ "$CONFIG_BOARD" = "nitropad-nv41" ] || [ "$CONFIG_BOARD" = "nitropad-ns50" ]; then
/bin/nitropad-shutdown.sh
fi

# Sync all mounted filesystems
echo s > /proc/sysrq-trigger

Expand Down
8 changes: 6 additions & 2 deletions initrd/bin/seal-hotpkey
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,12 +136,16 @@ if [ "$admin_pin_status" -ne 0 ]; then
if ! hotp_initialize "$admin_pin" $HOTP_SECRET $counter_value "$HOTPKEY_BRANDING" ; then
# don't leak key on failure
shred -n 10 -z -u "$HOTP_SECRET" 2> /dev/null
fatal_error "Setting HOTP secret failed"
if [ "$HOTPKEY_BRANDING" == "Nitrokey" ]; then
fatal_error "Setting HOTP secret failed, to reset nitrokey pin use: nitropy nk3 secrets reset or the Nitrokey App 2"
else
fatal_error "Setting HOTP secret failed"
fi
fi
fi
else
# remind user to change admin password
echo -e "\nWARNING: default GPG admin PIN detected: please change this as soon as possible."
echo -e "\nWARNING: default admin PIN detected: please change this as soon as possible."
fi

# HOTP key no longer needed
Expand Down
2 changes: 1 addition & 1 deletion initrd/etc/ash_functions
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,8 +347,8 @@ enable_usb()
if ! lsmod | grep -q xhci_pci; then
insmod /lib/modules/xhci-pci.ko \
|| die "xhci_pci: module load failed"
sleep 2
fi
sleep 2

if [ "$CONFIG_USB_KEYBOARD" = y ]; then
if ! lsmod | grep -q usbhid; then
Expand Down
6 changes: 3 additions & 3 deletions modules/hotp-verification
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ modules-$(CONFIG_HOTPKEY) += hotp-verification

hotp-verification_depends := libusb $(musl_dep)

# v1.5
hotp-verification_version := 70c04f51387eee8f777e943ba83b6405764a3cd2
# v1.6
hotp-verification_version := e9050e0c914e7a8ffef5d1c82a014e0e2bf79346
hotp-verification_dir := hotp-verification-$(hotp-verification_version)
hotp-verification_tar := nitrokey-hotp-verification-$(hotp-verification_version).tar.gz
hotp-verification_url := https://github.com/Nitrokey/nitrokey-hotp-verification/archive/$(hotp-verification_version).tar.gz
hotp-verification_hash := 5244b6b514117f955a03be2363fd51567a125cb8dc904d1bd89351be27eb8bb3
hotp-verification_hash := 480c978d3585eee73b9aa5186b471d4caeeeeba411217e1544eef7cfd90312ac

hotp-verification_target := \
$(MAKE_JOBS) \
Expand Down
12 changes: 6 additions & 6 deletions site-local/config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,31 +3,31 @@ BRAND_NAME=Dasharo
ifeq "nitropad-nv41" "$(BOARD)"

export CONFIG_BOARD_NAME="NovaCustom NV4xPZ"
export CONFIG_COREBOOT_LOCALVERSION="\(coreboot+heads\) v0.9.0"
export CONFIG_COREBOOT_LOCALVERSION="\(coreboot+heads\) v0.9.1"
export CONFIG_COREBOOT_SMBIOS_PRODUCT_NAME=NV4xPZ
export CONFIG_COREBOOT_SMBIOS_MANUFACTURER=Notebook

else ifeq "nitropad-ns50" "$(BOARD)"

export CONFIG_BOARD_NAME="NovaCustom NS5x_NS7xPU"
export CONFIG_COREBOOT_LOCALVERSION="\(coreboot+heads\) v0.9.0"
export CONFIG_COREBOOT_LOCALVERSION="\(coreboot+heads\) v0.9.1"
export CONFIG_COREBOOT_SMBIOS_PRODUCT_NAME=NS5x_NS7xPU
export CONFIG_COREBOOT_SMBIOS_MANUFACTURER=Notebook

else ifeq "msi_z690a_ddr4" "$(BOARD)"

export CONFIG_COREBOOT_LOCALVERSION="\(coreboot+heads\) v0.9.0"
export CONFIG_COREBOOT_LOCALVERSION="\(coreboot+heads\) v0.9.1"

else ifeq "msi_z690a_ddr5" "$(BOARD)"

export CONFIG_COREBOOT_LOCALVERSION="\(coreboot+heads\) v0.9.0"
export CONFIG_COREBOOT_LOCALVERSION="\(coreboot+heads\) v0.9.1"

else ifeq "msi_z790p_ddr4" "$(BOARD)"

export CONFIG_COREBOOT_LOCALVERSION="\(coreboot+heads\) v0.9.0"
export CONFIG_COREBOOT_LOCALVERSION="\(coreboot+heads\) v0.9.1"

else ifeq "msi_z790p_ddr5" "$(BOARD)"

export CONFIG_COREBOOT_LOCALVERSION="\(coreboot+heads\) v0.9.0"
export CONFIG_COREBOOT_LOCALVERSION="\(coreboot+heads\) v0.9.1"

endif