Skip to content

Commit 265b1da

Browse files
JonathonHall-PurismJonathonHall-Purism
committed
Revert "Merge pull request #1713 from tlaurion/interim_fix_1712"
This reverts commit c43b6fc, reversing changes made to fb9c558. Signed-off-by: Jonathon Hall <jonathon.hall@puri.sm>
1 parent 7596838 commit 265b1da

12 files changed

Lines changed: 98 additions & 67 deletions

‎.circleci/config.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ commands:
4545
jobs:
4646
prep_env:
4747
docker:
48-
- image: tlaurion/heads-dev-env:v0.1.9
48+
- image: tlaurion/heads-dev-env:v0.2.0
4949
resource_class: large
5050
working_directory: ~/heads
5151
steps:
@@ -111,7 +111,7 @@ jobs:
111111

112112
build_and_persist:
113113
docker:
114-
- image: tlaurion/heads-dev-env:v0.1.9
114+
- image: tlaurion/heads-dev-env:v0.2.0
115115
resource_class: large
116116
working_directory: ~/heads
117117
parameters:
@@ -139,7 +139,7 @@ jobs:
139139

140140
build:
141141
docker:
142-
- image: tlaurion/heads-dev-env:v0.1.9
142+
- image: tlaurion/heads-dev-env:v0.2.0
143143
resource_class: large
144144
working_directory: ~/heads
145145
parameters:
@@ -160,7 +160,7 @@ jobs:
160160

161161
save_cache:
162162
docker:
163-
- image: tlaurion/heads-dev-env:v0.1.9
163+
- image: tlaurion/heads-dev-env:v0.2.0
164164
resource_class: large
165165
working_directory: ~/heads
166166
steps:

‎config/coreboot-librem_11.config‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,6 @@ CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
174174
CONFIG_BOARD_PURISM_BASEBOARD_LIBREM_JSL=y
175175
# CONFIG_ENABLE_UART2 is not set
176176
CONFIG_FSP_TEMP_RAM_SIZE=0x28000
177-
CONFIG_HEAP_SIZE=0x8000
178177
CONFIG_EC_GPE_SCI=0x50
179178
CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet loglevel=2"
180179
CONFIG_BOARD_ROMSIZE_KB_16384=y
@@ -189,6 +188,7 @@ CONFIG_BOARD_ROMSIZE_KB_16384=y
189188
# CONFIG_COREBOOT_ROMSIZE_KB_10240 is not set
190189
# CONFIG_COREBOOT_ROMSIZE_KB_12288 is not set
191190
CONFIG_COREBOOT_ROMSIZE_KB_16384=y
191+
# CONFIG_COREBOOT_ROMSIZE_KB_24576 is not set
192192
# CONFIG_COREBOOT_ROMSIZE_KB_32768 is not set
193193
# CONFIG_COREBOOT_ROMSIZE_KB_65536 is not set
194194
CONFIG_COREBOOT_ROMSIZE_KB=16384
@@ -222,6 +222,7 @@ CONFIG_SMM_MODULE_STACK_SIZE=0x800
222222
CONFIG_ACPI_BERT_SIZE=0x0
223223
CONFIG_DRIVERS_I2C_DESIGNWARE_CLOCK_MHZ=133
224224
CONFIG_PRERAM_CBFS_CACHE_SIZE=0x4000
225+
CONFIG_DOMAIN_RESOURCE_32BIT_LIMIT=0xe0000000
225226
CONFIG_ACPI_CPU_STRING="CP%02X"
226227
CONFIG_STACK_SIZE=0x2000
227228
CONFIG_IFD_CHIPSET="jsl"
@@ -253,6 +254,7 @@ CONFIG_SOC_INTEL_JASPERLAKE_DEBUG_CONSENT=0
253254
CONFIG_SOC_INTEL_GFX_FRAMEBUFFER_OFFSET=0x0
254255
CONFIG_PCIE_LTR_MAX_SNOOP_LATENCY=0x1003
255256
CONFIG_PCIE_LTR_MAX_NO_SNOOP_LATENCY=0x1003
257+
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
256258
CONFIG_SOC_INTEL_COMMON_BLOCK_P2SB=y
257259
CONFIG_FIXED_SMBUS_IO_BASE=0xefa0
258260
CONFIG_CBFS_CACHE_ALIGN=8
@@ -300,6 +302,7 @@ CONFIG_SOC_INTEL_COMMON_BLOCK_ME_SPEC_13=y
300302
CONFIG_ME_SPEC=13
301303
CONFIG_CSE_RESET_CLEAR_EC_AP_IDLE_FLAG=y
302304
CONFIG_SOC_INTEL_COMMON_BLOCK_DSP=y
305+
CONFIG_SOC_INTEL_COMMON_BLOCK_DTT=y
303306
CONFIG_SOC_INTEL_COMMON_BLOCK_FAST_SPI=y
304307
CONFIG_FAST_SPI_DISABLE_WRITE_STATUS=y
305308
CONFIG_SOC_INTEL_COMMON_BLOCK_GPIO=y
@@ -337,7 +340,6 @@ CONFIG_SOC_INTEL_COMMON_BLOCK_SMM_IO_TRAP=y
337340
CONFIG_SOC_INTEL_COMMON_BLOCK_SMM_S5_DELAY_MS=0
338341
CONFIG_SOC_INTEL_COMMON_BLOCK_SPI=y
339342
CONFIG_SOC_INTEL_COMMON_BLOCK_SA=y
340-
CONFIG_DOMAIN_RESOURCE_32BIT_LIMIT=0xe0000000
341343
CONFIG_SOC_INTEL_COMMON_BLOCK_TIMER=y
342344
CONFIG_SOC_INTEL_COMMON_BLOCK_UART=y
343345
CONFIG_SOC_INTEL_COMMON_BLOCK_XDCI=y
@@ -490,8 +492,6 @@ CONFIG_PCI_SET_BUS_MASTER_PCI_BRIDGES=y
490492
CONFIG_PCI_ALLOW_BUS_MASTER_ANY_DEVICE=y
491493
# CONFIG_PCIEXP_SUPPORT_RESIZABLE_BARS is not set
492494
# CONFIG_PCIEXP_LANE_ERR_STAT_CLEAR is not set
493-
CONFIG_FIRMWARE_CONNECTION_MANAGER=y
494-
# CONFIG_SOFTWARE_CONNECTION_MANAGER is not set
495495
# CONFIG_EARLY_PCI_BRIDGE is not set
496496
CONFIG_SUBSYSTEM_VENDOR_ID=0x0000
497497
CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
@@ -563,6 +563,7 @@ CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
563563
# CONFIG_DRIVERS_SIL_3114 is not set
564564
CONFIG_DRIVERS_USB_ACPI=y
565565
CONFIG_DRIVERS_WIFI_GENERIC=y
566+
CONFIG_DRIVERS_MTK_WIFI=y
566567
CONFIG_MP_SERVICES_PPI=y
567568
CONFIG_MP_SERVICES_PPI_V1=y
568569
# end of Generic Drivers
@@ -589,6 +590,7 @@ CONFIG_NO_TPM=y
589590
CONFIG_PCR_BOOT_MODE=1
590591
CONFIG_PCR_HWID=1
591592
CONFIG_PCR_SRTM=2
593+
CONFIG_PCR_FW_VER=10
592594
CONFIG_PCR_RUNTIME_DATA=3
593595
# end of Trusted Platform Module
594596

@@ -620,6 +622,7 @@ CONFIG_BOOT_DEVICE_SPI_FLASH=y
620622
CONFIG_BOOT_DEVICE_MEMORY_MAPPED=y
621623
CONFIG_BOOT_DEVICE_SUPPORTS_WRITES=y
622624
CONFIG_RTC=y
625+
CONFIG_HEAP_SIZE=0x100000
623626

624627
#
625628
# Console
@@ -680,6 +683,7 @@ CONFIG_PAYLOAD_FILE="@BOARD_BUILD_DIR@/bzImage"
680683
CONFIG_PAYLOAD_OPTIONS=""
681684
# CONFIG_PXE is not set
682685
CONFIG_LINUX_INITRD="@BOARD_BUILD_DIR@/initrd.cpio.xz"
686+
# CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
683687
CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
684688

685689
#

‎config/coreboot-librem_13v2.config‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,6 @@ CONFIG_BOARD_PURISM_LIBREM13_V2=y
182182
# CONFIG_DRIVERS_UART_8250IO is not set
183183
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
184184
CONFIG_BOARD_PURISM_BASEBOARD_LIBREM_SKL=y
185-
CONFIG_HEAP_SIZE=0x80000
186185
CONFIG_EC_GPE_SCI=0x50
187186
CONFIG_TPM_MEASURED_BOOT=y
188187
CONFIG_LINUX_COMMAND_LINE="quiet loglevel=2"
@@ -198,6 +197,7 @@ CONFIG_BOARD_ROMSIZE_KB_16384=y
198197
# CONFIG_COREBOOT_ROMSIZE_KB_10240 is not set
199198
# CONFIG_COREBOOT_ROMSIZE_KB_12288 is not set
200199
CONFIG_COREBOOT_ROMSIZE_KB_16384=y
200+
# CONFIG_COREBOOT_ROMSIZE_KB_24576 is not set
201201
# CONFIG_COREBOOT_ROMSIZE_KB_32768 is not set
202202
# CONFIG_COREBOOT_ROMSIZE_KB_65536 is not set
203203
CONFIG_COREBOOT_ROMSIZE_KB=16384
@@ -231,6 +231,7 @@ CONFIG_SMM_MODULE_STACK_SIZE=0x800
231231
CONFIG_ACPI_BERT_SIZE=0x0
232232
CONFIG_DRIVERS_I2C_DESIGNWARE_CLOCK_MHZ=120
233233
CONFIG_PRERAM_CBFS_CACHE_SIZE=0x4000
234+
CONFIG_DOMAIN_RESOURCE_32BIT_LIMIT=0xe0000000
234235
CONFIG_ACPI_CPU_STRING="CP%02X"
235236
CONFIG_STACK_SIZE=0x2000
236237
CONFIG_IFD_CHIPSET="sklkbl"
@@ -260,6 +261,7 @@ CONFIG_CPU_INTEL_NUM_FIT_ENTRIES=10
260261
CONFIG_SOC_INTEL_GFX_FRAMEBUFFER_OFFSET=0x0
261262
CONFIG_PCIE_LTR_MAX_SNOOP_LATENCY=0x1003
262263
CONFIG_PCIE_LTR_MAX_NO_SNOOP_LATENCY=0x1003
264+
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
263265
CONFIG_SOC_INTEL_COMMON_SKYLAKE_BASE=y
264266
CONFIG_SOC_INTEL_SKYLAKE=y
265267
CONFIG_SOC_INTEL_COMMON_BLOCK_P2SB=y
@@ -353,7 +355,6 @@ CONFIG_SOC_INTEL_COMMON_BLOCK_SMM_IO_TRAP=y
353355
CONFIG_SOC_INTEL_COMMON_BLOCK_SMM_S5_DELAY_MS=0
354356
CONFIG_SOC_INTEL_COMMON_BLOCK_SPI=y
355357
CONFIG_SOC_INTEL_COMMON_BLOCK_SA=y
356-
CONFIG_DOMAIN_RESOURCE_32BIT_LIMIT=0xe0000000
357358
CONFIG_SA_ENABLE_DPR=y
358359
CONFIG_SOC_INTEL_COMMON_BLOCK_THERMAL=y
359360
CONFIG_SOC_INTEL_COMMON_BLOCK_THERMAL_PCI_DEV=y
@@ -514,8 +515,6 @@ CONFIG_PCI_SET_BUS_MASTER_PCI_BRIDGES=y
514515
CONFIG_PCI_ALLOW_BUS_MASTER_ANY_DEVICE=y
515516
# CONFIG_PCIEXP_SUPPORT_RESIZABLE_BARS is not set
516517
# CONFIG_PCIEXP_LANE_ERR_STAT_CLEAR is not set
517-
CONFIG_FIRMWARE_CONNECTION_MANAGER=y
518-
# CONFIG_SOFTWARE_CONNECTION_MANAGER is not set
519518
# CONFIG_EARLY_PCI_BRIDGE is not set
520519
CONFIG_SUBSYSTEM_VENDOR_ID=0x0000
521520
CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
@@ -595,6 +594,7 @@ CONFIG_MEMORY_MAPPED_TPM=y
595594
CONFIG_TPM_TIS_BASE_ADDRESS=0xfed40000
596595
# CONFIG_DRIVERS_SIL_3114 is not set
597596
CONFIG_DRIVERS_WIFI_GENERIC=y
597+
CONFIG_DRIVERS_MTK_WIFI=y
598598
# end of Generic Drivers
599599

600600
#
@@ -629,6 +629,7 @@ CONFIG_TPM_MEASURED_BOOT_RUNTIME_DATA=""
629629
CONFIG_PCR_BOOT_MODE=1
630630
CONFIG_PCR_HWID=1
631631
CONFIG_PCR_SRTM=2
632+
CONFIG_PCR_FW_VER=10
632633
CONFIG_PCR_RUNTIME_DATA=3
633634
# end of Trusted Platform Module
634635

@@ -661,6 +662,7 @@ CONFIG_BOOT_DEVICE_SPI_FLASH=y
661662
CONFIG_BOOT_DEVICE_MEMORY_MAPPED=y
662663
CONFIG_BOOT_DEVICE_SUPPORTS_WRITES=y
663664
CONFIG_RTC=y
665+
CONFIG_HEAP_SIZE=0x100000
664666

665667
#
666668
# Console
@@ -722,6 +724,7 @@ CONFIG_PAYLOAD_FILE="@BOARD_BUILD_DIR@/bzImage"
722724
CONFIG_PAYLOAD_OPTIONS=""
723725
# CONFIG_PXE is not set
724726
CONFIG_LINUX_INITRD="@BOARD_BUILD_DIR@/initrd.cpio.xz"
727+
# CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
725728
CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
726729

727730
#

‎config/coreboot-librem_13v4.config‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,6 @@ CONFIG_BOARD_PURISM_LIBREM13_V4=y
182182
# CONFIG_DRIVERS_UART_8250IO is not set
183183
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
184184
CONFIG_BOARD_PURISM_BASEBOARD_LIBREM_SKL=y
185-
CONFIG_HEAP_SIZE=0x80000
186185
CONFIG_EC_GPE_SCI=0x50
187186
CONFIG_TPM_MEASURED_BOOT=y
188187
CONFIG_LINUX_COMMAND_LINE="quiet loglevel=2"
@@ -198,6 +197,7 @@ CONFIG_BOARD_ROMSIZE_KB_16384=y
198197
# CONFIG_COREBOOT_ROMSIZE_KB_10240 is not set
199198
# CONFIG_COREBOOT_ROMSIZE_KB_12288 is not set
200199
CONFIG_COREBOOT_ROMSIZE_KB_16384=y
200+
# CONFIG_COREBOOT_ROMSIZE_KB_24576 is not set
201201
# CONFIG_COREBOOT_ROMSIZE_KB_32768 is not set
202202
# CONFIG_COREBOOT_ROMSIZE_KB_65536 is not set
203203
CONFIG_COREBOOT_ROMSIZE_KB=16384
@@ -231,6 +231,7 @@ CONFIG_SMM_MODULE_STACK_SIZE=0x800
231231
CONFIG_ACPI_BERT_SIZE=0x0
232232
CONFIG_DRIVERS_I2C_DESIGNWARE_CLOCK_MHZ=120
233233
CONFIG_PRERAM_CBFS_CACHE_SIZE=0x4000
234+
CONFIG_DOMAIN_RESOURCE_32BIT_LIMIT=0xe0000000
234235
CONFIG_ACPI_CPU_STRING="CP%02X"
235236
CONFIG_STACK_SIZE=0x2000
236237
CONFIG_IFD_CHIPSET="sklkbl"
@@ -260,6 +261,7 @@ CONFIG_CPU_INTEL_NUM_FIT_ENTRIES=10
260261
CONFIG_SOC_INTEL_GFX_FRAMEBUFFER_OFFSET=0x0
261262
CONFIG_PCIE_LTR_MAX_SNOOP_LATENCY=0x1003
262263
CONFIG_PCIE_LTR_MAX_NO_SNOOP_LATENCY=0x1003
264+
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
263265
CONFIG_SOC_INTEL_COMMON_SKYLAKE_BASE=y
264266
CONFIG_SOC_INTEL_KABYLAKE=y
265267
CONFIG_SOC_INTEL_COMMON_BLOCK_P2SB=y
@@ -353,7 +355,6 @@ CONFIG_SOC_INTEL_COMMON_BLOCK_SMM_IO_TRAP=y
353355
CONFIG_SOC_INTEL_COMMON_BLOCK_SMM_S5_DELAY_MS=0
354356
CONFIG_SOC_INTEL_COMMON_BLOCK_SPI=y
355357
CONFIG_SOC_INTEL_COMMON_BLOCK_SA=y
356-
CONFIG_DOMAIN_RESOURCE_32BIT_LIMIT=0xe0000000
357358
CONFIG_SA_ENABLE_DPR=y
358359
CONFIG_SOC_INTEL_COMMON_BLOCK_THERMAL=y
359360
CONFIG_SOC_INTEL_COMMON_BLOCK_THERMAL_PCI_DEV=y
@@ -514,8 +515,6 @@ CONFIG_PCI_SET_BUS_MASTER_PCI_BRIDGES=y
514515
CONFIG_PCI_ALLOW_BUS_MASTER_ANY_DEVICE=y
515516
# CONFIG_PCIEXP_SUPPORT_RESIZABLE_BARS is not set
516517
# CONFIG_PCIEXP_LANE_ERR_STAT_CLEAR is not set
517-
CONFIG_FIRMWARE_CONNECTION_MANAGER=y
518-
# CONFIG_SOFTWARE_CONNECTION_MANAGER is not set
519518
# CONFIG_EARLY_PCI_BRIDGE is not set
520519
CONFIG_SUBSYSTEM_VENDOR_ID=0x0000
521520
CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
@@ -595,6 +594,7 @@ CONFIG_MEMORY_MAPPED_TPM=y
595594
CONFIG_TPM_TIS_BASE_ADDRESS=0xfed40000
596595
# CONFIG_DRIVERS_SIL_3114 is not set
597596
CONFIG_DRIVERS_WIFI_GENERIC=y
597+
CONFIG_DRIVERS_MTK_WIFI=y
598598
# end of Generic Drivers
599599

600600
#
@@ -629,6 +629,7 @@ CONFIG_TPM_MEASURED_BOOT_RUNTIME_DATA=""
629629
CONFIG_PCR_BOOT_MODE=1
630630
CONFIG_PCR_HWID=1
631631
CONFIG_PCR_SRTM=2
632+
CONFIG_PCR_FW_VER=10
632633
CONFIG_PCR_RUNTIME_DATA=3
633634
# end of Trusted Platform Module
634635

@@ -661,6 +662,7 @@ CONFIG_BOOT_DEVICE_SPI_FLASH=y
661662
CONFIG_BOOT_DEVICE_MEMORY_MAPPED=y
662663
CONFIG_BOOT_DEVICE_SUPPORTS_WRITES=y
663664
CONFIG_RTC=y
665+
CONFIG_HEAP_SIZE=0x100000
664666

665667
#
666668
# Console
@@ -722,6 +724,7 @@ CONFIG_PAYLOAD_FILE="@BOARD_BUILD_DIR@/bzImage"
722724
CONFIG_PAYLOAD_OPTIONS=""
723725
# CONFIG_PXE is not set
724726
CONFIG_LINUX_INITRD="@BOARD_BUILD_DIR@/initrd.cpio.xz"
727+
# CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
725728
CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
726729

727730
#

‎config/coreboot-librem_14.config‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ CONFIG_ME_BIN_PATH="3rdparty/purism-blobs/mainboard/purism/librem_cnl/librem_14/
151151
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
152152
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
153153
CONFIG_SPI_FLASH_DONT_INCLUDE_ALL_DRIVERS=y
154-
CONFIG_USE_LEGACY_8254_TIMER=y
154+
# CONFIG_USE_LEGACY_8254_TIMER is not set
155155
# CONFIG_DEBUG_SMI is not set
156156
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="Librem 14"
157157
CONFIG_HAVE_IFD_BIN=y
@@ -180,7 +180,6 @@ CONFIG_BOARD_PURISM_LIBREM_14=y
180180
CONFIG_BOARD_PURISM_BASEBOARD_LIBREM_CNL=y
181181
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
182182
CONFIG_FSP_TEMP_RAM_SIZE=0x10000
183-
CONFIG_HEAP_SIZE=0x8000
184183
CONFIG_EC_GPE_SCI=0x50
185184
CONFIG_TPM_MEASURED_BOOT=y
186185
CONFIG_LINUX_COMMAND_LINE="quiet loglevel=2"
@@ -196,6 +195,7 @@ CONFIG_BOARD_ROMSIZE_KB_16384=y
196195
# CONFIG_COREBOOT_ROMSIZE_KB_10240 is not set
197196
# CONFIG_COREBOOT_ROMSIZE_KB_12288 is not set
198197
CONFIG_COREBOOT_ROMSIZE_KB_16384=y
198+
# CONFIG_COREBOOT_ROMSIZE_KB_24576 is not set
199199
# CONFIG_COREBOOT_ROMSIZE_KB_32768 is not set
200200
# CONFIG_COREBOOT_ROMSIZE_KB_65536 is not set
201201
CONFIG_COREBOOT_ROMSIZE_KB=16384
@@ -229,6 +229,7 @@ CONFIG_SMM_MODULE_STACK_SIZE=0x800
229229
CONFIG_ACPI_BERT_SIZE=0x0
230230
CONFIG_DRIVERS_I2C_DESIGNWARE_CLOCK_MHZ=216
231231
CONFIG_PRERAM_CBFS_CACHE_SIZE=0x4000
232+
CONFIG_DOMAIN_RESOURCE_32BIT_LIMIT=0xe0000000
232233
CONFIG_ACPI_CPU_STRING="CP%02X"
233234
CONFIG_STACK_SIZE=0x2000
234235
CONFIG_IFD_CHIPSET="cnl"
@@ -263,6 +264,7 @@ CONFIG_CPU_INTEL_NUM_FIT_ENTRIES=4
263264
CONFIG_SOC_INTEL_GFX_FRAMEBUFFER_OFFSET=0x0
264265
CONFIG_PCIE_LTR_MAX_SNOOP_LATENCY=0x1003
265266
CONFIG_PCIE_LTR_MAX_NO_SNOOP_LATENCY=0x1003
267+
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
266268
CONFIG_SOC_INTEL_COMMON_BLOCK_P2SB=y
267269
CONFIG_FIXED_SMBUS_IO_BASE=0xefa0
268270
CONFIG_CBFS_CACHE_ALIGN=8
@@ -309,6 +311,7 @@ CONFIG_SOC_INTEL_CSE_HAVE_SPEC_SUPPORT=y
309311
CONFIG_SOC_INTEL_COMMON_BLOCK_ME_SPEC_12=y
310312
CONFIG_ME_SPEC=12
311313
CONFIG_SOC_INTEL_COMMON_BLOCK_DSP=y
314+
CONFIG_SOC_INTEL_COMMON_BLOCK_DTT=y
312315
CONFIG_SOC_INTEL_COMMON_BLOCK_FAST_SPI=y
313316
CONFIG_FAST_SPI_DISABLE_WRITE_STATUS=y
314317
CONFIG_SOC_INTEL_COMMON_BLOCK_GPIO=y
@@ -347,7 +350,6 @@ CONFIG_SOC_INTEL_COMMON_BLOCK_SMM_IO_TRAP=y
347350
CONFIG_SOC_INTEL_COMMON_BLOCK_SMM_S5_DELAY_MS=0
348351
CONFIG_SOC_INTEL_COMMON_BLOCK_SPI=y
349352
CONFIG_SOC_INTEL_COMMON_BLOCK_SA=y
350-
CONFIG_DOMAIN_RESOURCE_32BIT_LIMIT=0xe0000000
351353
CONFIG_SOC_INTEL_COMMON_BLOCK_THERMAL=y
352354
CONFIG_SOC_INTEL_COMMON_BLOCK_THERMAL_PCI_DEV=y
353355
CONFIG_SOC_INTEL_COMMON_BLOCK_TIMER=y
@@ -510,8 +512,6 @@ CONFIG_PCI_SET_BUS_MASTER_PCI_BRIDGES=y
510512
CONFIG_PCI_ALLOW_BUS_MASTER_ANY_DEVICE=y
511513
# CONFIG_PCIEXP_SUPPORT_RESIZABLE_BARS is not set
512514
# CONFIG_PCIEXP_LANE_ERR_STAT_CLEAR is not set
513-
CONFIG_FIRMWARE_CONNECTION_MANAGER=y
514-
# CONFIG_SOFTWARE_CONNECTION_MANAGER is not set
515515
# CONFIG_EARLY_PCI_BRIDGE is not set
516516
CONFIG_SUBSYSTEM_VENDOR_ID=0x0000
517517
CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
@@ -600,6 +600,7 @@ CONFIG_TPM_TIS_BASE_ADDRESS=0xfed40000
600600
# CONFIG_DRIVERS_SIL_3114 is not set
601601
CONFIG_DRIVERS_USB_ACPI=y
602602
CONFIG_DRIVERS_WIFI_GENERIC=y
603+
CONFIG_DRIVERS_MTK_WIFI=y
603604
# end of Generic Drivers
604605

605606
#
@@ -634,6 +635,7 @@ CONFIG_TPM_MEASURED_BOOT_RUNTIME_DATA=""
634635
CONFIG_PCR_BOOT_MODE=1
635636
CONFIG_PCR_HWID=1
636637
CONFIG_PCR_SRTM=2
638+
CONFIG_PCR_FW_VER=10
637639
CONFIG_PCR_RUNTIME_DATA=3
638640
# end of Trusted Platform Module
639641

@@ -666,6 +668,7 @@ CONFIG_BOOT_DEVICE_SPI_FLASH=y
666668
CONFIG_BOOT_DEVICE_MEMORY_MAPPED=y
667669
CONFIG_BOOT_DEVICE_SUPPORTS_WRITES=y
668670
CONFIG_RTC=y
671+
CONFIG_HEAP_SIZE=0x100000
669672

670673
#
671674
# Console
@@ -727,6 +730,7 @@ CONFIG_PAYLOAD_FILE="@BOARD_BUILD_DIR@/bzImage"
727730
CONFIG_PAYLOAD_OPTIONS=""
728731
# CONFIG_PXE is not set
729732
CONFIG_LINUX_INITRD="@BOARD_BUILD_DIR@/initrd.cpio.xz"
733+
# CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
730734
CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
731735

732736
#

0 commit comments

Comments
 (0)