Skip to content

Commit c43b6fc

Browse files
authored
Merge pull request #1713 from tlaurion/interim_fix_1712
Revert "Merge pull request #1703 from JonathonHall-Purism/purism_coreboot_24.02.01"
2 parents fb9c558 + b20cde8 commit c43b6fc

12 files changed

Lines changed: 67 additions & 98 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.2.0
48+
- image: tlaurion/heads-dev-env:v0.1.9
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.2.0
114+
- image: tlaurion/heads-dev-env:v0.1.9
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.2.0
142+
- image: tlaurion/heads-dev-env:v0.1.9
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.2.0
163+
- image: tlaurion/heads-dev-env:v0.1.9
164164
resource_class: large
165165
working_directory: ~/heads
166166
steps:

config/coreboot-librem_11.config

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,7 @@ 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
177178
CONFIG_EC_GPE_SCI=0x50
178179
CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet loglevel=2"
179180
CONFIG_BOARD_ROMSIZE_KB_16384=y
@@ -188,7 +189,6 @@ CONFIG_BOARD_ROMSIZE_KB_16384=y
188189
# CONFIG_COREBOOT_ROMSIZE_KB_10240 is not set
189190
# CONFIG_COREBOOT_ROMSIZE_KB_12288 is not set
190191
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,7 +222,6 @@ 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
226225
CONFIG_ACPI_CPU_STRING="CP%02X"
227226
CONFIG_STACK_SIZE=0x2000
228227
CONFIG_IFD_CHIPSET="jsl"
@@ -254,7 +253,6 @@ CONFIG_SOC_INTEL_JASPERLAKE_DEBUG_CONSENT=0
254253
CONFIG_SOC_INTEL_GFX_FRAMEBUFFER_OFFSET=0x0
255254
CONFIG_PCIE_LTR_MAX_SNOOP_LATENCY=0x1003
256255
CONFIG_PCIE_LTR_MAX_NO_SNOOP_LATENCY=0x1003
257-
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
258256
CONFIG_SOC_INTEL_COMMON_BLOCK_P2SB=y
259257
CONFIG_FIXED_SMBUS_IO_BASE=0xefa0
260258
CONFIG_CBFS_CACHE_ALIGN=8
@@ -302,7 +300,6 @@ CONFIG_SOC_INTEL_COMMON_BLOCK_ME_SPEC_13=y
302300
CONFIG_ME_SPEC=13
303301
CONFIG_CSE_RESET_CLEAR_EC_AP_IDLE_FLAG=y
304302
CONFIG_SOC_INTEL_COMMON_BLOCK_DSP=y
305-
CONFIG_SOC_INTEL_COMMON_BLOCK_DTT=y
306303
CONFIG_SOC_INTEL_COMMON_BLOCK_FAST_SPI=y
307304
CONFIG_FAST_SPI_DISABLE_WRITE_STATUS=y
308305
CONFIG_SOC_INTEL_COMMON_BLOCK_GPIO=y
@@ -340,6 +337,7 @@ CONFIG_SOC_INTEL_COMMON_BLOCK_SMM_IO_TRAP=y
340337
CONFIG_SOC_INTEL_COMMON_BLOCK_SMM_S5_DELAY_MS=0
341338
CONFIG_SOC_INTEL_COMMON_BLOCK_SPI=y
342339
CONFIG_SOC_INTEL_COMMON_BLOCK_SA=y
340+
CONFIG_DOMAIN_RESOURCE_32BIT_LIMIT=0xe0000000
343341
CONFIG_SOC_INTEL_COMMON_BLOCK_TIMER=y
344342
CONFIG_SOC_INTEL_COMMON_BLOCK_UART=y
345343
CONFIG_SOC_INTEL_COMMON_BLOCK_XDCI=y
@@ -492,6 +490,8 @@ CONFIG_PCI_SET_BUS_MASTER_PCI_BRIDGES=y
492490
CONFIG_PCI_ALLOW_BUS_MASTER_ANY_DEVICE=y
493491
# CONFIG_PCIEXP_SUPPORT_RESIZABLE_BARS is not set
494492
# 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,7 +563,6 @@ 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
567566
CONFIG_MP_SERVICES_PPI=y
568567
CONFIG_MP_SERVICES_PPI_V1=y
569568
# end of Generic Drivers
@@ -590,7 +589,6 @@ CONFIG_NO_TPM=y
590589
CONFIG_PCR_BOOT_MODE=1
591590
CONFIG_PCR_HWID=1
592591
CONFIG_PCR_SRTM=2
593-
CONFIG_PCR_FW_VER=10
594592
CONFIG_PCR_RUNTIME_DATA=3
595593
# end of Trusted Platform Module
596594

@@ -622,7 +620,6 @@ CONFIG_BOOT_DEVICE_SPI_FLASH=y
622620
CONFIG_BOOT_DEVICE_MEMORY_MAPPED=y
623621
CONFIG_BOOT_DEVICE_SUPPORTS_WRITES=y
624622
CONFIG_RTC=y
625-
CONFIG_HEAP_SIZE=0x100000
626623

627624
#
628625
# Console
@@ -683,7 +680,6 @@ CONFIG_PAYLOAD_FILE="@BOARD_BUILD_DIR@/bzImage"
683680
CONFIG_PAYLOAD_OPTIONS=""
684681
# CONFIG_PXE is not set
685682
CONFIG_LINUX_INITRD="@BOARD_BUILD_DIR@/initrd.cpio.xz"
686-
# CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
687683
CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
688684

689685
#

config/coreboot-librem_13v2.config

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,7 @@ 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
185186
CONFIG_EC_GPE_SCI=0x50
186187
CONFIG_TPM_MEASURED_BOOT=y
187188
CONFIG_LINUX_COMMAND_LINE="quiet loglevel=2"
@@ -197,7 +198,6 @@ CONFIG_BOARD_ROMSIZE_KB_16384=y
197198
# CONFIG_COREBOOT_ROMSIZE_KB_10240 is not set
198199
# CONFIG_COREBOOT_ROMSIZE_KB_12288 is not set
199200
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,7 +231,6 @@ 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
235234
CONFIG_ACPI_CPU_STRING="CP%02X"
236235
CONFIG_STACK_SIZE=0x2000
237236
CONFIG_IFD_CHIPSET="sklkbl"
@@ -261,7 +260,6 @@ CONFIG_CPU_INTEL_NUM_FIT_ENTRIES=10
261260
CONFIG_SOC_INTEL_GFX_FRAMEBUFFER_OFFSET=0x0
262261
CONFIG_PCIE_LTR_MAX_SNOOP_LATENCY=0x1003
263262
CONFIG_PCIE_LTR_MAX_NO_SNOOP_LATENCY=0x1003
264-
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
265263
CONFIG_SOC_INTEL_COMMON_SKYLAKE_BASE=y
266264
CONFIG_SOC_INTEL_SKYLAKE=y
267265
CONFIG_SOC_INTEL_COMMON_BLOCK_P2SB=y
@@ -355,6 +353,7 @@ CONFIG_SOC_INTEL_COMMON_BLOCK_SMM_IO_TRAP=y
355353
CONFIG_SOC_INTEL_COMMON_BLOCK_SMM_S5_DELAY_MS=0
356354
CONFIG_SOC_INTEL_COMMON_BLOCK_SPI=y
357355
CONFIG_SOC_INTEL_COMMON_BLOCK_SA=y
356+
CONFIG_DOMAIN_RESOURCE_32BIT_LIMIT=0xe0000000
358357
CONFIG_SA_ENABLE_DPR=y
359358
CONFIG_SOC_INTEL_COMMON_BLOCK_THERMAL=y
360359
CONFIG_SOC_INTEL_COMMON_BLOCK_THERMAL_PCI_DEV=y
@@ -515,6 +514,8 @@ CONFIG_PCI_SET_BUS_MASTER_PCI_BRIDGES=y
515514
CONFIG_PCI_ALLOW_BUS_MASTER_ANY_DEVICE=y
516515
# CONFIG_PCIEXP_SUPPORT_RESIZABLE_BARS is not set
517516
# CONFIG_PCIEXP_LANE_ERR_STAT_CLEAR is not set
517+
CONFIG_FIRMWARE_CONNECTION_MANAGER=y
518+
# CONFIG_SOFTWARE_CONNECTION_MANAGER is not set
518519
# CONFIG_EARLY_PCI_BRIDGE is not set
519520
CONFIG_SUBSYSTEM_VENDOR_ID=0x0000
520521
CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
@@ -594,7 +595,6 @@ CONFIG_MEMORY_MAPPED_TPM=y
594595
CONFIG_TPM_TIS_BASE_ADDRESS=0xfed40000
595596
# CONFIG_DRIVERS_SIL_3114 is not set
596597
CONFIG_DRIVERS_WIFI_GENERIC=y
597-
CONFIG_DRIVERS_MTK_WIFI=y
598598
# end of Generic Drivers
599599

600600
#
@@ -629,7 +629,6 @@ 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
633632
CONFIG_PCR_RUNTIME_DATA=3
634633
# end of Trusted Platform Module
635634

@@ -662,7 +661,6 @@ CONFIG_BOOT_DEVICE_SPI_FLASH=y
662661
CONFIG_BOOT_DEVICE_MEMORY_MAPPED=y
663662
CONFIG_BOOT_DEVICE_SUPPORTS_WRITES=y
664663
CONFIG_RTC=y
665-
CONFIG_HEAP_SIZE=0x100000
666664

667665
#
668666
# Console
@@ -724,7 +722,6 @@ CONFIG_PAYLOAD_FILE="@BOARD_BUILD_DIR@/bzImage"
724722
CONFIG_PAYLOAD_OPTIONS=""
725723
# CONFIG_PXE is not set
726724
CONFIG_LINUX_INITRD="@BOARD_BUILD_DIR@/initrd.cpio.xz"
727-
# CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
728725
CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
729726

730727
#

config/coreboot-librem_13v4.config

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,7 @@ 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
185186
CONFIG_EC_GPE_SCI=0x50
186187
CONFIG_TPM_MEASURED_BOOT=y
187188
CONFIG_LINUX_COMMAND_LINE="quiet loglevel=2"
@@ -197,7 +198,6 @@ CONFIG_BOARD_ROMSIZE_KB_16384=y
197198
# CONFIG_COREBOOT_ROMSIZE_KB_10240 is not set
198199
# CONFIG_COREBOOT_ROMSIZE_KB_12288 is not set
199200
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,7 +231,6 @@ 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
235234
CONFIG_ACPI_CPU_STRING="CP%02X"
236235
CONFIG_STACK_SIZE=0x2000
237236
CONFIG_IFD_CHIPSET="sklkbl"
@@ -261,7 +260,6 @@ CONFIG_CPU_INTEL_NUM_FIT_ENTRIES=10
261260
CONFIG_SOC_INTEL_GFX_FRAMEBUFFER_OFFSET=0x0
262261
CONFIG_PCIE_LTR_MAX_SNOOP_LATENCY=0x1003
263262
CONFIG_PCIE_LTR_MAX_NO_SNOOP_LATENCY=0x1003
264-
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
265263
CONFIG_SOC_INTEL_COMMON_SKYLAKE_BASE=y
266264
CONFIG_SOC_INTEL_KABYLAKE=y
267265
CONFIG_SOC_INTEL_COMMON_BLOCK_P2SB=y
@@ -355,6 +353,7 @@ CONFIG_SOC_INTEL_COMMON_BLOCK_SMM_IO_TRAP=y
355353
CONFIG_SOC_INTEL_COMMON_BLOCK_SMM_S5_DELAY_MS=0
356354
CONFIG_SOC_INTEL_COMMON_BLOCK_SPI=y
357355
CONFIG_SOC_INTEL_COMMON_BLOCK_SA=y
356+
CONFIG_DOMAIN_RESOURCE_32BIT_LIMIT=0xe0000000
358357
CONFIG_SA_ENABLE_DPR=y
359358
CONFIG_SOC_INTEL_COMMON_BLOCK_THERMAL=y
360359
CONFIG_SOC_INTEL_COMMON_BLOCK_THERMAL_PCI_DEV=y
@@ -515,6 +514,8 @@ CONFIG_PCI_SET_BUS_MASTER_PCI_BRIDGES=y
515514
CONFIG_PCI_ALLOW_BUS_MASTER_ANY_DEVICE=y
516515
# CONFIG_PCIEXP_SUPPORT_RESIZABLE_BARS is not set
517516
# CONFIG_PCIEXP_LANE_ERR_STAT_CLEAR is not set
517+
CONFIG_FIRMWARE_CONNECTION_MANAGER=y
518+
# CONFIG_SOFTWARE_CONNECTION_MANAGER is not set
518519
# CONFIG_EARLY_PCI_BRIDGE is not set
519520
CONFIG_SUBSYSTEM_VENDOR_ID=0x0000
520521
CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
@@ -594,7 +595,6 @@ CONFIG_MEMORY_MAPPED_TPM=y
594595
CONFIG_TPM_TIS_BASE_ADDRESS=0xfed40000
595596
# CONFIG_DRIVERS_SIL_3114 is not set
596597
CONFIG_DRIVERS_WIFI_GENERIC=y
597-
CONFIG_DRIVERS_MTK_WIFI=y
598598
# end of Generic Drivers
599599

600600
#
@@ -629,7 +629,6 @@ 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
633632
CONFIG_PCR_RUNTIME_DATA=3
634633
# end of Trusted Platform Module
635634

@@ -662,7 +661,6 @@ CONFIG_BOOT_DEVICE_SPI_FLASH=y
662661
CONFIG_BOOT_DEVICE_MEMORY_MAPPED=y
663662
CONFIG_BOOT_DEVICE_SUPPORTS_WRITES=y
664663
CONFIG_RTC=y
665-
CONFIG_HEAP_SIZE=0x100000
666664

667665
#
668666
# Console
@@ -724,7 +722,6 @@ CONFIG_PAYLOAD_FILE="@BOARD_BUILD_DIR@/bzImage"
724722
CONFIG_PAYLOAD_OPTIONS=""
725723
# CONFIG_PXE is not set
726724
CONFIG_LINUX_INITRD="@BOARD_BUILD_DIR@/initrd.cpio.xz"
727-
# CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
728725
CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
729726

730727
#

config/coreboot-librem_14.config

Lines changed: 5 additions & 9 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 is not set
154+
CONFIG_USE_LEGACY_8254_TIMER=y
155155
# CONFIG_DEBUG_SMI is not set
156156
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="Librem 14"
157157
CONFIG_HAVE_IFD_BIN=y
@@ -180,6 +180,7 @@ 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
183184
CONFIG_EC_GPE_SCI=0x50
184185
CONFIG_TPM_MEASURED_BOOT=y
185186
CONFIG_LINUX_COMMAND_LINE="quiet loglevel=2"
@@ -195,7 +196,6 @@ CONFIG_BOARD_ROMSIZE_KB_16384=y
195196
# CONFIG_COREBOOT_ROMSIZE_KB_10240 is not set
196197
# CONFIG_COREBOOT_ROMSIZE_KB_12288 is not set
197198
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,7 +229,6 @@ 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
233232
CONFIG_ACPI_CPU_STRING="CP%02X"
234233
CONFIG_STACK_SIZE=0x2000
235234
CONFIG_IFD_CHIPSET="cnl"
@@ -264,7 +263,6 @@ CONFIG_CPU_INTEL_NUM_FIT_ENTRIES=4
264263
CONFIG_SOC_INTEL_GFX_FRAMEBUFFER_OFFSET=0x0
265264
CONFIG_PCIE_LTR_MAX_SNOOP_LATENCY=0x1003
266265
CONFIG_PCIE_LTR_MAX_NO_SNOOP_LATENCY=0x1003
267-
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
268266
CONFIG_SOC_INTEL_COMMON_BLOCK_P2SB=y
269267
CONFIG_FIXED_SMBUS_IO_BASE=0xefa0
270268
CONFIG_CBFS_CACHE_ALIGN=8
@@ -311,7 +309,6 @@ CONFIG_SOC_INTEL_CSE_HAVE_SPEC_SUPPORT=y
311309
CONFIG_SOC_INTEL_COMMON_BLOCK_ME_SPEC_12=y
312310
CONFIG_ME_SPEC=12
313311
CONFIG_SOC_INTEL_COMMON_BLOCK_DSP=y
314-
CONFIG_SOC_INTEL_COMMON_BLOCK_DTT=y
315312
CONFIG_SOC_INTEL_COMMON_BLOCK_FAST_SPI=y
316313
CONFIG_FAST_SPI_DISABLE_WRITE_STATUS=y
317314
CONFIG_SOC_INTEL_COMMON_BLOCK_GPIO=y
@@ -350,6 +347,7 @@ CONFIG_SOC_INTEL_COMMON_BLOCK_SMM_IO_TRAP=y
350347
CONFIG_SOC_INTEL_COMMON_BLOCK_SMM_S5_DELAY_MS=0
351348
CONFIG_SOC_INTEL_COMMON_BLOCK_SPI=y
352349
CONFIG_SOC_INTEL_COMMON_BLOCK_SA=y
350+
CONFIG_DOMAIN_RESOURCE_32BIT_LIMIT=0xe0000000
353351
CONFIG_SOC_INTEL_COMMON_BLOCK_THERMAL=y
354352
CONFIG_SOC_INTEL_COMMON_BLOCK_THERMAL_PCI_DEV=y
355353
CONFIG_SOC_INTEL_COMMON_BLOCK_TIMER=y
@@ -512,6 +510,8 @@ CONFIG_PCI_SET_BUS_MASTER_PCI_BRIDGES=y
512510
CONFIG_PCI_ALLOW_BUS_MASTER_ANY_DEVICE=y
513511
# CONFIG_PCIEXP_SUPPORT_RESIZABLE_BARS is not set
514512
# 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,7 +600,6 @@ 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
604603
# end of Generic Drivers
605604

606605
#
@@ -635,7 +634,6 @@ CONFIG_TPM_MEASURED_BOOT_RUNTIME_DATA=""
635634
CONFIG_PCR_BOOT_MODE=1
636635
CONFIG_PCR_HWID=1
637636
CONFIG_PCR_SRTM=2
638-
CONFIG_PCR_FW_VER=10
639637
CONFIG_PCR_RUNTIME_DATA=3
640638
# end of Trusted Platform Module
641639

@@ -668,7 +666,6 @@ CONFIG_BOOT_DEVICE_SPI_FLASH=y
668666
CONFIG_BOOT_DEVICE_MEMORY_MAPPED=y
669667
CONFIG_BOOT_DEVICE_SUPPORTS_WRITES=y
670668
CONFIG_RTC=y
671-
CONFIG_HEAP_SIZE=0x100000
672669

673670
#
674671
# Console
@@ -730,7 +727,6 @@ CONFIG_PAYLOAD_FILE="@BOARD_BUILD_DIR@/bzImage"
730727
CONFIG_PAYLOAD_OPTIONS=""
731728
# CONFIG_PXE is not set
732729
CONFIG_LINUX_INITRD="@BOARD_BUILD_DIR@/initrd.cpio.xz"
733-
# CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
734730
CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
735731

736732
#

0 commit comments

Comments
 (0)