Merge remote-tracking branch 'osresearch/master' into nitrokey_board_…

…unification_clean-enable_htop_validated_autoboot-novacustom_coreboot_version_bump

.github/ISSUE_TEMPLATE/bug-report-for-everything-except-build-errors.md

@@ -11,90 +11,92 @@ assignees: ''
 
 ### A. Provide Hardware Details
 
-**1. What board are you using (see list of boards [here](https://github.com/eganonoa/heads/tree/master/boards))?**
-
-**2. Does your computer have a dGPU or is it iGPU-only?**
-- [ ] dGPU
-- [ ] iGPU-only
-
-**3. Who installed Heads on this computer?**
-- [ ] Insurgo
-- [ ] Nitrokey
-- [ ] Purism
-- [ ] Other provider
-- [ ] Self-installed
-
-**4. What PGP key is being used?**
-- [ ] Librem Key
-- [ ] Nitrokey Pro 2
-- [ ] Nitrokey Storage
-- [ ] Yubikey
-- [ ] Other
-
-**5. Are you using the PGP key to provide HOTP verification?**
-- [ ] Yes
-- [ ] No
-- [ ] I don't know
+1. What board are you using? (Choose from the list of boards [here](https://github.com/eganonoa/heads/tree/master/boards))
+
+2. Does your computer have a dGPU or is it iGPU-only?
+    - [ ] dGPU (Distinct GPU other then internal gPU)
+    - [ ] iGPU-only (Internal GPU, normally Intel GPU)
+
+3. Who installed Heads on this computer?
+    - [ ] Insurgo (Issues to be reported at https://github.com/linuxboot/heads/issues)
+    - [ ] Nitrokey (Issues to be reported at https://github.com/Nitrokey/heads/issues)
+    - [ ] Purism (Issues to be reported at https://source.puri.sm/firmware/pureboot/-/issues)
+    - [ ] Novacustom (Issues to be reported at https://github.com/Dasharo/dasharo-issues)
+    - [ ] HardnenedVault (Issues to be reported at https://github.com/hardenedvault/vaultboot/issues)
+    - [ ] Other provider
+    - [ ] Self-installed
+
+4. What PGP key is being used?
+    - [ ] Librem Key (Nitrokey Pro 2 rebranded)
+    - [ ] Nitrokey Pro
+    - [ ] Nitrokey Pro 2
+    - [ ] Nitrokey 3 NFC
+    - [ ] Nitrokey 3 NFC Mini
+    - [ ] Nitrokey Storage
+    - [ ] Nitrokey Storage 2
+    - [ ] Yubikey
+    - [ ] Other
+
+5. Are you using the PGP key to provide HOTP verification?
+    - [ ] Yes
+    - [ ] No
+    - [ ] I don't know
 
 ### B. Identify how the board was flashed
 
-**1. Is this problem related to updating heads or flashing it for the first time?**
-- [ ] First-time flash
-- [ ] Updating heads 
+1. Is this problem related to updating heads or flashing it for the first time?
+    - [ ] First-time flash
+    - [ ] Updating heads 
 
-**2. If the problem is related to an update, how did you attempt to apply the update?**
-- [ ] Using the Heads GUI
-- [ ] Flashrom via the Recovery Shell
-- [ ] External flashing
+2. If the problem is related to an update, how did you attempt to apply the update?
+    - [ ] Using the Heads menus
+    - [ ] Flashrom via the Recovery Shell
+    - [ ] External flashing
 
-**3. How was Heads initially flashed**
-- [ ] External flashing
-- [ ] Internal-only / 1vyrain
-- [ ] Don't know
+3. How was Heads initially flashed?
+    - [ ] External flashing
+    - [ ] Internal-only / 1vyprep+1vyrain / skulls
+    - [ ] Don't know
 
-**4. Was the board flashed with a maximized or non-maximized/legacy rom?**
-- [ ] Maximized
-- [ ] Non-maximized / legacy
-- [ ] I don't know
+4. Was the board flashed with a maximized or non-maximized/legacy rom?
+    - [ ] Maximized
+    - [ ] Non-maximized / legacy
+    - [ ] I don't know
 
-**5. If Heads was externally flashed, was IFD unlocked?**
-- [ ] Yes
-- [ ] No
-- [ ] Don't know
+5. If Heads was externally flashed, was IFD unlocked?
+    - [ ] Yes
+    - [ ] No
+    - [ ] Don't know
 
 ### C. Identify the rom related to this bug report
 
-**1. Did you download or build the rom at issue in this bug report?**
-- [ ] I downloaded it
-- [ ] I built it
-
-**2. If you downloaded your rom, where did you get it from?**
-- [ ] Heads CircleCi
-- [ ] Purism
-- [ ] Nitrokey
-- [ ] Somewhere else (please identify)
-
-*Please provide the release number or otherwise identify the rom downloaded*
-
-**3. If you built your rom, which repository:branch did you use?**
-- [ ] Heads:Master
-- [ ] Other (please identify)
-
-**4. What version of coreboot did you use in building?**
-- [ ] 4.8.1 (current default in heads:master)
-- [ ] 4.13
-- [ ] 4.14
-- [ ] 4.15
-- [ ] Other (please specify)
-- [ ] I don't know
-
-**5. In building the rom where did you get the blobs?**
-- [ ] No blobs required
-- [ ] Provided by the company that installed Heads on the device
-- [ ] Extracted from a backup rom taken from this device
-- [ ] Extracted from another backup rom taken from another device (please identify the board model)
-- [ ] Extracted from the online bios using the automated tools provided in Heads
-- [ ] I don't know
+1. Did you download or build the rom at issue in this bug report?
+    - [ ] I downloaded it
+    - [ ] I built it
+
+2. If you downloaded your rom, where did you get it from?
+    - [ ] Heads CircleCi
+    - [ ] Purism
+    - [ ] Nitrokey
+    - [ ] Dasharo DTS (Novacustom)
+    - [ ] Somewhere else (please identify)
+
+    *Please provide the release number or otherwise identify the rom downloaded*
+
+3. If you built your rom, which repository:branch did you use?
+    - [ ] Heads:Master
+    - [ ] Other (please identify)
+
+4. What version of coreboot did you use in building?
+{ You can find this information from github commit ID or once flashed, by giving the complete version from Sytem Information under Options --> menu}
+
+5. In building the rom, where did you get the blobs?
+    - [ ] No blobs required
+    - [ ] Provided by the company that installed Heads on the device
+    - [ ] Extracted from a backup rom taken from this device
+    - [ ] Extracted from another backup rom taken from another device (please identify the board model)
+    - [ ] Extracted from the online bios using the automated tools provided in Heads
+    - [ ] I don't know
 
 ## Please describe the problem
 

.github/ISSUE_TEMPLATE/bug-report-for-heads-build-errors.md

@@ -16,11 +16,7 @@ assignees: ''
 - [ ] Other (please specify)
 
 **3. What version of coreboot are you trying to build**
-- [ ] 4.13
-- [ ] 4.14
-- [ ] 4.15
-- [ ] 4.17
-- [ ] Other (please specify)
+{Please provide github commit ID, or once flashed, the information found under System Information for version}
 
 **4. In building the rom where did you get the blobs?**
 - [ ] No blobs required