Skip to content

Commit c08b183

Browse files
committed
WiP: use dasharo kgpe-d16 fork + add nvme support in all associated linux configs
1 parent 6e31163 commit c08b183

File tree

9 files changed

+369
-33
lines changed

9 files changed

+369
-33
lines changed

.circleci/config.yml

+29-21
Original file line numberDiff line numberDiff line change
@@ -223,15 +223,23 @@ workflows:
223223
requires:
224224
- prep_env
225225

226-
# Coreboot 4.17
226+
# Coreboot for librems, reusing submodules built cache from x230-hotp-maximized
227227
- build_and_persist:
228228
name: librem_14
229229
target: librem_14
230230
subcommand: ""
231231
requires:
232232
- x230-hotp-maximized
233233

234-
# Coreboot for Talos (PPC)
234+
# Coreboot fork for kgpe-d16, reusing submodules built cache from x230-hotp-maximized
235+
- build_and_persist:
236+
name: kgpe-d16_workstation
237+
target: kgpe-d16_workstation
238+
subcommand: ""
239+
requires:
240+
- x230-hotp-maximized
241+
242+
# Coreboot fork for Talos (PPC)
235243
- build_and_persist:
236244
name: talos-2
237245
arch: ppc64
@@ -498,7 +506,7 @@ workflows:
498506
requires:
499507
- x230-hotp-maximized
500508

501-
#Coreboot 4.17 boards
509+
#Coreboot librems coreboot fork boards
502510
- build:
503511
name: librem_13v2
504512
target: librem_13v2
@@ -541,26 +549,26 @@ workflows:
541549
requires:
542550
- librem_14
543551

544-
# - build:
545-
# name: UNTESTED_kgpe-d16_workstation-usb_keyboard
546-
# target: UNTESTED_kgpe-d16_workstation-usb_keyboard
547-
# subcommand: ""
548-
# requires:
549-
# - UNTESTED_kgpe-d16_workstation
552+
- build:
553+
name: kgpe-d16_workstation-usb_keyboard
554+
target: kgpe-d16_workstation-usb_keyboard
555+
subcommand: ""
556+
requires:
557+
- kgpe-d16_workstation
550558

551-
# - build:
552-
# name: UNTESTED_kgpe-d16_server
553-
# target: UNTESTED_kgpe-d16_server
554-
# subcommand: ""
555-
# requires:
556-
# - UNTESTED_kgpe-d16_workstation
559+
- build:
560+
name: kgpe-d16_server
561+
target: kgpe-d16_server
562+
subcommand: ""
563+
requires:
564+
- kgpe-d16_workstation
557565

558-
# - build:
559-
# name: UNTESTED_kgpe-d16_server-whiptail
560-
# target: UNTESTED_kgpe-d16_server-whiptail
561-
# subcommand: ""
562-
# requires:
563-
# - UNTESTED_kgpe-d16_workstation
566+
- build:
567+
name: kgpe-d16_server-whiptail
568+
target: kgpe-d16_server-whiptail
569+
subcommand: ""
570+
requires:
571+
- kgpe-d16_workstation
564572

565573
# - build:
566574
# name: librem_l1um

boards/UNTESTED_kgpe-d16_server-whiptail/UNTESTED_kgpe-d16_server-whiptail.config

+3-4
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
# sure their operating system loads microcode updates.
1919

2020
export CONFIG_COREBOOT=y
21-
export CONFIG_COREBOOT_VERSION=4.11
21+
export CONFIG_COREBOOT_VERSION=dasharo-kgpe-d16
2222
export CONFIG_LINUX_VERSION=5.10.5
2323

2424
CONFIG_COREBOOT_CONFIG=config/coreboot-kgpe-d16_server-whiptail.config
@@ -57,11 +57,10 @@ export CONFIG_BOOTSCRIPT=/bin/gui-init
5757

5858
#CONSOLE SELECTION
5959
#Single output to OpenBMC
60-
export CONFIG_BOOT_KERNEL_ADD="nohz=on console=ttyS1,115200n8 "
60+
#export CONFIG_BOOT_KERNEL_ADD="nohz=on console=ttyS1,115200n8 "
6161

6262
#Dual output to local console (tty0) and OpenBmc (ttyS1)
63-
#export CONFIG_BOOT_KERNEL_ADD="nohz=on console=ttyS1,115200n8 console=tty0"
64-
63+
export CONFIG_BOOT_KERNEL_ADD="nohz=on console=ttyS1,115200n8 console=tty0"
6564
#Single output to tty0
6665
#export CONFIG_BOOT_KERNEL_ADD="nohz=on"
6766
export CONFIG_BOOT_RECOVERY_SERIAL="/dev/ttyS0"

boards/UNTESTED_kgpe-d16_server/UNTESTED_kgpe-d16_server.config

+11-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# - Please contribute documentation on heads-wiki
1717
# - Please support https://github.com/osresearch/heads/issues/719
1818
export CONFIG_COREBOOT=y
19-
export CONFIG_COREBOOT_VERSION=4.11
19+
export CONFIG_COREBOOT_VERSION=dasharo-kgpe-d16
2020
export CONFIG_LINUX_VERSION=5.10.5
2121

2222
CONFIG_COREBOOT_CONFIG=config/coreboot-kgpe-d16_server.config
@@ -36,20 +36,30 @@ CONFIG_QRENCODE=y
3636
CONFIG_TPMTOTP=y
3737
CONFIG_DROPBEAR=y
3838

39+
#Whiptail
40+
#CONFIG_SLANG=y
41+
#CONFIG_NEWT=y
42+
#FBWhiptail
43+
#CONFIG_CAIRO=y
44+
#CONFIG_FBWHIPTAIL=y
45+
3946
CONFIG_LINUX_USB=y
4047
CONFIG_LINUX_E1000E=y
4148
export CONFIG_LINUX_USB_COMPANION_CONTROLLER=y
4249

4350
export CONFIG_TPM=y
4451
#BOOT SCRIPT SELECTION
4552
export CONFIG_BOOTSCRIPT=/bin/generic-init
53+
#export CONFIG_BOOTSCRIPT=/bin/gui-init
4654
#export CONFIG_BOOTSCRIPT_NETWORK=/bin/network-init-recovery
4755

4856
#CONSOLE SELECTION
4957
#Single output to OpenBMC
5058
#export CONFIG_BOOT_KERNEL_ADD="nohz=on console=ttyS1,115200n8 "
5159
#Dual output to local console (tty0) and OpenBmc (ttyS1)
5260
export CONFIG_BOOT_KERNEL_ADD="nohz=on console=ttyS1,115200n8 console=tty0"
61+
#Single output to tty0
62+
#export CONFIG_BOOT_KERNEL_ADD="nohz=on"
5363
export CONFIG_BOOT_RECOVERY_SERIAL="/dev/ttyS0"
5464
export CONFIG_BOOT_STATIC_IP=192.168.2.3
5565

boards/UNTESTED_kgpe-d16_workstation-usb_keyboard/UNTESTED_kgpe-d16_workstation-usb_keyboard.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# sure their operating system loads microcode updates.
1313

1414
export CONFIG_COREBOOT=y
15-
export CONFIG_COREBOOT_VERSION=4.11
15+
export CONFIG_COREBOOT_VERSION=dasharo-kgpe-d16
1616
export CONFIG_LINUX_VERSION=5.10.5
1717

1818
CONFIG_COREBOOT_CONFIG=config/coreboot-kgpe-d16_workstation-usb_keyboard.config

boards/UNTESTED_kgpe-d16_workstation/UNTESTED_kgpe-d16_workstation.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717

1818
export CONFIG_COREBOOT=y
19-
export CONFIG_COREBOOT_VERSION=4.11
19+
export CONFIG_COREBOOT_VERSION=dasharo-kgpe-d16
2020
export CONFIG_LINUX_VERSION=5.10.5
2121

2222
CONFIG_COREBOOT_CONFIG=config/coreboot-kgpe-d16_workstation.config

config/linux-kgpe-d16_server-whiptail.config

+157-2
Original file line numberDiff line numberDiff line change
@@ -957,8 +957,12 @@ CONFIG_BLK_DEV_RAM_SIZE=65536
957957
#
958958
# NVME Support
959959
#
960-
# CONFIG_BLK_DEV_NVME is not set
960+
CONFIG_NVME_CORE=y
961+
CONFIG_BLK_DEV_NVME=y
962+
# CONFIG_NVME_MULTIPATH is not set
963+
# CONFIG_NVME_HWMON is not set
961964
# CONFIG_NVME_FC is not set
965+
# CONFIG_NVME_TCP is not set
962966
# end of NVME Support
963967

964968
#
@@ -1609,6 +1613,7 @@ CONFIG_I2C_SLAVE=y
16091613
# CONFIG_POWER_RESET is not set
16101614
CONFIG_POWER_SUPPLY=y
16111615
# CONFIG_POWER_SUPPLY_DEBUG is not set
1616+
CONFIG_POWER_SUPPLY_HWMON=y
16121617
# CONFIG_PDA_POWER is not set
16131618
# CONFIG_TEST_POWER is not set
16141619
# CONFIG_CHARGER_ADP5061 is not set
@@ -1627,11 +1632,160 @@ CONFIG_POWER_SUPPLY=y
16271632
# CONFIG_CHARGER_SMB347 is not set
16281633
# CONFIG_BATTERY_GAUGE_LTC2941 is not set
16291634
# CONFIG_CHARGER_BD99954 is not set
1630-
# CONFIG_HWMON is not set
1635+
CONFIG_HWMON=y
1636+
# CONFIG_HWMON_DEBUG_CHIP is not set
1637+
1638+
#
1639+
# Native drivers
1640+
#
1641+
# CONFIG_SENSORS_ABITUGURU is not set
1642+
# CONFIG_SENSORS_ABITUGURU3 is not set
1643+
# CONFIG_SENSORS_AD7414 is not set
1644+
# CONFIG_SENSORS_AD7418 is not set
1645+
# CONFIG_SENSORS_ADM1021 is not set
1646+
# CONFIG_SENSORS_ADM1025 is not set
1647+
# CONFIG_SENSORS_ADM1026 is not set
1648+
# CONFIG_SENSORS_ADM1029 is not set
1649+
# CONFIG_SENSORS_ADM1031 is not set
1650+
# CONFIG_SENSORS_ADM1177 is not set
1651+
# CONFIG_SENSORS_ADM9240 is not set
1652+
# CONFIG_SENSORS_ADT7410 is not set
1653+
# CONFIG_SENSORS_ADT7411 is not set
1654+
# CONFIG_SENSORS_ADT7462 is not set
1655+
# CONFIG_SENSORS_ADT7470 is not set
1656+
# CONFIG_SENSORS_ADT7475 is not set
1657+
# CONFIG_SENSORS_AS370 is not set
1658+
# CONFIG_SENSORS_ASC7621 is not set
1659+
# CONFIG_SENSORS_AXI_FAN_CONTROL is not set
1660+
# CONFIG_SENSORS_K8TEMP is not set
1661+
# CONFIG_SENSORS_K10TEMP is not set
1662+
# CONFIG_SENSORS_FAM15H_POWER is not set
1663+
# CONFIG_SENSORS_AMD_ENERGY is not set
1664+
# CONFIG_SENSORS_APPLESMC is not set
1665+
# CONFIG_SENSORS_ASB100 is not set
1666+
# CONFIG_SENSORS_ASPEED is not set
1667+
# CONFIG_SENSORS_ATXP1 is not set
1668+
# CONFIG_SENSORS_CORSAIR_CPRO is not set
1669+
# CONFIG_SENSORS_DRIVETEMP is not set
1670+
# CONFIG_SENSORS_DS620 is not set
1671+
# CONFIG_SENSORS_DS1621 is not set
1672+
# CONFIG_SENSORS_DELL_SMM is not set
1673+
# CONFIG_SENSORS_I5K_AMB is not set
1674+
# CONFIG_SENSORS_F71805F is not set
1675+
# CONFIG_SENSORS_F71882FG is not set
1676+
# CONFIG_SENSORS_F75375S is not set
1677+
# CONFIG_SENSORS_FSCHMD is not set
1678+
# CONFIG_SENSORS_GL518SM is not set
1679+
# CONFIG_SENSORS_GL520SM is not set
1680+
# CONFIG_SENSORS_G760A is not set
1681+
# CONFIG_SENSORS_G762 is not set
1682+
# CONFIG_SENSORS_HIH6130 is not set
1683+
# CONFIG_SENSORS_I5500 is not set
1684+
# CONFIG_SENSORS_CORETEMP is not set
1685+
# CONFIG_SENSORS_IT87 is not set
1686+
# CONFIG_SENSORS_JC42 is not set
1687+
# CONFIG_SENSORS_POWR1220 is not set
1688+
# CONFIG_SENSORS_LINEAGE is not set
1689+
# CONFIG_SENSORS_LTC2945 is not set
1690+
# CONFIG_SENSORS_LTC2947_I2C is not set
1691+
# CONFIG_SENSORS_LTC2990 is not set
1692+
# CONFIG_SENSORS_LTC4151 is not set
1693+
# CONFIG_SENSORS_LTC4215 is not set
1694+
# CONFIG_SENSORS_LTC4222 is not set
1695+
# CONFIG_SENSORS_LTC4245 is not set
1696+
# CONFIG_SENSORS_LTC4260 is not set
1697+
# CONFIG_SENSORS_LTC4261 is not set
1698+
# CONFIG_SENSORS_MAX16065 is not set
1699+
# CONFIG_SENSORS_MAX1619 is not set
1700+
# CONFIG_SENSORS_MAX1668 is not set
1701+
# CONFIG_SENSORS_MAX197 is not set
1702+
# CONFIG_SENSORS_MAX31730 is not set
1703+
# CONFIG_SENSORS_MAX6621 is not set
1704+
# CONFIG_SENSORS_MAX6639 is not set
1705+
# CONFIG_SENSORS_MAX6642 is not set
1706+
# CONFIG_SENSORS_MAX6650 is not set
1707+
# CONFIG_SENSORS_MAX6697 is not set
1708+
# CONFIG_SENSORS_MAX31790 is not set
1709+
# CONFIG_SENSORS_MCP3021 is not set
1710+
# CONFIG_SENSORS_TC654 is not set
1711+
# CONFIG_SENSORS_MR75203 is not set
1712+
# CONFIG_SENSORS_LM63 is not set
1713+
# CONFIG_SENSORS_LM73 is not set
1714+
# CONFIG_SENSORS_LM75 is not set
1715+
# CONFIG_SENSORS_LM77 is not set
1716+
# CONFIG_SENSORS_LM78 is not set
1717+
# CONFIG_SENSORS_LM80 is not set
1718+
# CONFIG_SENSORS_LM83 is not set
1719+
# CONFIG_SENSORS_LM85 is not set
1720+
# CONFIG_SENSORS_LM87 is not set
1721+
# CONFIG_SENSORS_LM90 is not set
1722+
# CONFIG_SENSORS_LM92 is not set
1723+
# CONFIG_SENSORS_LM93 is not set
1724+
# CONFIG_SENSORS_LM95234 is not set
1725+
# CONFIG_SENSORS_LM95241 is not set
1726+
# CONFIG_SENSORS_LM95245 is not set
1727+
# CONFIG_SENSORS_PC87360 is not set
1728+
# CONFIG_SENSORS_PC87427 is not set
1729+
# CONFIG_SENSORS_NTC_THERMISTOR is not set
1730+
# CONFIG_SENSORS_NCT6683 is not set
1731+
# CONFIG_SENSORS_NCT6775 is not set
1732+
# CONFIG_SENSORS_NCT7802 is not set
1733+
# CONFIG_SENSORS_NPCM7XX is not set
1734+
# CONFIG_SENSORS_PCF8591 is not set
1735+
# CONFIG_PMBUS is not set
1736+
# CONFIG_SENSORS_SHT21 is not set
1737+
# CONFIG_SENSORS_SHT3x is not set
1738+
# CONFIG_SENSORS_SHTC1 is not set
1739+
# CONFIG_SENSORS_SIS5595 is not set
1740+
# CONFIG_SENSORS_DME1737 is not set
1741+
# CONFIG_SENSORS_EMC1403 is not set
1742+
# CONFIG_SENSORS_EMC2103 is not set
1743+
# CONFIG_SENSORS_EMC6W201 is not set
1744+
# CONFIG_SENSORS_SMSC47M1 is not set
1745+
# CONFIG_SENSORS_SMSC47M192 is not set
1746+
# CONFIG_SENSORS_SMSC47B397 is not set
1747+
# CONFIG_SENSORS_STTS751 is not set
1748+
# CONFIG_SENSORS_SMM665 is not set
1749+
# CONFIG_SENSORS_ADC128D818 is not set
1750+
# CONFIG_SENSORS_ADS7828 is not set
1751+
# CONFIG_SENSORS_AMC6821 is not set
1752+
# CONFIG_SENSORS_INA209 is not set
1753+
# CONFIG_SENSORS_INA2XX is not set
1754+
# CONFIG_SENSORS_INA3221 is not set
1755+
# CONFIG_SENSORS_TC74 is not set
1756+
# CONFIG_SENSORS_THMC50 is not set
1757+
# CONFIG_SENSORS_TMP102 is not set
1758+
# CONFIG_SENSORS_TMP103 is not set
1759+
# CONFIG_SENSORS_TMP108 is not set
1760+
# CONFIG_SENSORS_TMP401 is not set
1761+
# CONFIG_SENSORS_TMP421 is not set
1762+
# CONFIG_SENSORS_TMP513 is not set
1763+
# CONFIG_SENSORS_VIA_CPUTEMP is not set
1764+
# CONFIG_SENSORS_VIA686A is not set
1765+
# CONFIG_SENSORS_VT1211 is not set
1766+
# CONFIG_SENSORS_VT8231 is not set
1767+
# CONFIG_SENSORS_W83773G is not set
1768+
# CONFIG_SENSORS_W83781D is not set
1769+
# CONFIG_SENSORS_W83791D is not set
1770+
# CONFIG_SENSORS_W83792D is not set
1771+
# CONFIG_SENSORS_W83793 is not set
1772+
# CONFIG_SENSORS_W83795 is not set
1773+
# CONFIG_SENSORS_W83L785TS is not set
1774+
# CONFIG_SENSORS_W83L786NG is not set
1775+
# CONFIG_SENSORS_W83627HF is not set
1776+
# CONFIG_SENSORS_W83627EHF is not set
1777+
# CONFIG_SENSORS_XGENE is not set
1778+
1779+
#
1780+
# ACPI drivers
1781+
#
1782+
# CONFIG_SENSORS_ACPI_POWER is not set
1783+
# CONFIG_SENSORS_ATK0110 is not set
16311784
CONFIG_THERMAL=y
16321785
# CONFIG_THERMAL_NETLINK is not set
16331786
# CONFIG_THERMAL_STATISTICS is not set
16341787
CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0
1788+
CONFIG_THERMAL_HWMON=y
16351789
# CONFIG_THERMAL_WRITABLE_TRIPS is not set
16361790
CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
16371791
# CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set
@@ -1686,6 +1840,7 @@ CONFIG_BCMA_POSSIBLE=y
16861840
# CONFIG_LPC_SCH is not set
16871841
# CONFIG_MFD_INTEL_LPSS_ACPI is not set
16881842
# CONFIG_MFD_INTEL_LPSS_PCI is not set
1843+
# CONFIG_MFD_INTEL_PMC_BXT is not set
16891844
# CONFIG_MFD_IQS62X is not set
16901845
# CONFIG_MFD_JANZ_CMODIO is not set
16911846
# CONFIG_MFD_KEMPLD is not set

0 commit comments

Comments
 (0)