Skip to content

Commit c755b84

Browse files
committed
update for coreboot-git
1 parent ed409ca commit c755b84

1 file changed

Lines changed: 53 additions & 29 deletions

File tree

config/coreboot-qemu.config

Lines changed: 53 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#
77
# General setup
88
#
9-
CONFIG_LOCALVERSION=""
9+
CONFIG_LOCALVERSION="-heads"
1010
CONFIG_CBFS_PREFIX="fallback"
1111
# CONFIG_MULTIPLE_CBFS_INSTANCES is not set
1212
CONFIG_COMPILER_GCC=y
@@ -18,13 +18,15 @@ CONFIG_COMPILER_GCC=y
1818
# CONFIG_UNCOMPRESSED_RAMSTAGE is not set
1919
CONFIG_COMPRESS_RAMSTAGE=y
2020
# CONFIG_INCLUDE_CONFIG_FILE is not set
21+
# CONFIG_NO_XIP_EARLY_STAGES is not set
2122
CONFIG_EARLY_CBMEM_INIT=y
23+
# CONFIG_EARLY_CBMEM_LIST is not set
2224
# CONFIG_COLLECT_TIMESTAMPS is not set
2325
# CONFIG_USE_BLOBS is not set
2426
# CONFIG_COVERAGE is not set
2527
# CONFIG_RELOCATABLE_MODULES is not set
2628
# CONFIG_RELOCATABLE_RAMSTAGE is not set
27-
CONFIG_FLASHMAP_OFFSET=0x00610000
29+
# CONFIG_NO_STAGE_CACHE is not set
2830
CONFIG_BOOTBLOCK_SIMPLE=y
2931
# CONFIG_BOOTBLOCK_NORMAL is not set
3032
CONFIG_BOOTBLOCK_CUSTOM=y
@@ -34,16 +36,17 @@ CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
3436
# CONFIG_GENERIC_GPIO_LIB is not set
3537
# CONFIG_BOARD_ID_AUTO is not set
3638
# CONFIG_BOARD_ID_MANUAL is not set
39+
CONFIG_DEVICETREE="devicetree.cb"
3740
# CONFIG_RAM_CODE_SUPPORT is not set
3841
# CONFIG_BOOTSPLASH_IMAGE is not set
39-
# CONFIG_ACPI_SATA_GENERATOR is not set
4042

4143
#
4244
# Mainboard
4345
#
4446
# CONFIG_VENDOR_A_TREND is not set
4547
# CONFIG_VENDOR_AAEON is not set
4648
# CONFIG_VENDOR_ABIT is not set
49+
# CONFIG_VENDOR_ADI is not set
4750
# CONFIG_VENDOR_ADLINK is not set
4851
# CONFIG_VENDOR_ADVANSUS is not set
4952
# CONFIG_VENDOR_AMD is not set
@@ -111,6 +114,9 @@ CONFIG_MAINBOARD_DIR="emulation/qemu-q35"
111114
CONFIG_MAINBOARD_PART_NUMBER="QEMU x86 q35/ich9"
112115
CONFIG_MAINBOARD_VENDOR="Emulation"
113116
CONFIG_MAX_CPUS=1
117+
CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
118+
CONFIG_CBFS_SIZE=0x400000
119+
CONFIG_UART_FOR_CONSOLE=0
114120
# CONFIG_ONBOARD_VGA_IS_PRIMARY is not set
115121
# CONFIG_VGA_BIOS is not set
116122
CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
@@ -122,7 +128,6 @@ CONFIG_POST_IO=y
122128
CONFIG_BOOTBLOCK_MAINBOARD_INIT="mainboard/emulation/qemu-q35/bootblock.c"
123129
CONFIG_MAX_REBOOT_CNT=3
124130
CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
125-
CONFIG_UART_FOR_CONSOLE=0
126131
CONFIG_ID_SECTION_OFFSET=0x80
127132
# CONFIG_BOARD_EMULATION_QEMU_ARMV7 is not set
128133
# CONFIG_BOARD_EMULATION_QEMU_X86_I440FX is not set
@@ -131,19 +136,15 @@ CONFIG_BOARD_EMULATION_QEMU_X86_Q35=y
131136
# CONFIG_BOARD_EMULATION_QEMU_UCB_RISCV is not set
132137
# CONFIG_BOARD_EMULATION_SPIKE_UCB_RISCV is not set
133138
CONFIG_BOARD_EMULATION_QEMU_X86=y
134-
CONFIG_RAMTOP=0x200000
135-
CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
136-
CONFIG_CBFS_SIZE=0x400000
137139
# CONFIG_POST_DEVICE is not set
138-
CONFIG_TPM_PIRQ=0
140+
CONFIG_DRIVERS_PS2_KEYBOARD=y
139141
CONFIG_TTYS0_LCS=3
140142
# CONFIG_CONSOLE_POST is not set
141143
CONFIG_DRIVERS_UART_8250IO=y
142144
CONFIG_CPU_ADDR_BITS=36
143-
CONFIG_DEFAULT_CONSOLE_LOGLEVEL=7
145+
CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
144146
# CONFIG_USBDEBUG is not set
145147
CONFIG_MAINBOARD_VERSION="1.0"
146-
CONFIG_DRIVERS_PS2_KEYBOARD=y
147148
# CONFIG_NO_POST is not set
148149
CONFIG_BOARD_ROMSIZE_KB_256=y
149150
# CONFIG_COREBOOT_ROMSIZE_KB_64 is not set
@@ -156,9 +157,12 @@ CONFIG_BOARD_ROMSIZE_KB_256=y
156157
# CONFIG_COREBOOT_ROMSIZE_KB_8192 is not set
157158
CONFIG_COREBOOT_ROMSIZE_KB_12288=y
158159
# CONFIG_COREBOOT_ROMSIZE_KB_16384 is not set
160+
# CONFIG_COREBOOT_ROMSIZE_KB_32768 is not set
161+
# CONFIG_COREBOOT_ROMSIZE_KB_65536 is not set
159162
CONFIG_COREBOOT_ROMSIZE_KB=12288
160163
CONFIG_ROM_SIZE=0xc00000
161164
CONFIG_FMDFILE=""
165+
# CONFIG_MAINBOARD_HAS_TPM2 is not set
162166
# CONFIG_SYSTEM_TYPE_LAPTOP is not set
163167
# CONFIG_CBFS_AUTOGEN_ATTRIBUTES is not set
164168

@@ -173,17 +177,21 @@ CONFIG_FMDFILE=""
173177
CONFIG_C_ENV_BOOTBLOCK_SIZE=0x10000
174178
CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
175179
CONFIG_ROMSTAGE_ADDR=0x2000000
180+
CONFIG_VERSTAGE_ADDR=0x2000000
176181
CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT="southbridge/intel/i82801ix/bootblock.c"
177182
CONFIG_TTYS0_BASE=0x3f8
178183
CONFIG_EHCI_BAR=0xfef00000
184+
CONFIG_RAMTOP=0x200000
179185
CONFIG_HEAP_SIZE=0x4000
180186
CONFIG_CONSOLE_CBMEM=y
187+
CONFIG_UART_PCI_ADDR=0
188+
CONFIG_HPET_MIN_TICKS=0x80
181189
# CONFIG_SOC_MARVELL_ARMADA38X is not set
182190
# CONFIG_SOC_MARVELL_BG4CD is not set
183191
# CONFIG_SOC_MEDIATEK_MT8173 is not set
184192
# CONFIG_SOC_NVIDIA_TEGRA124 is not set
185-
# CONFIG_SOC_NVIDIA_TEGRA132 is not set
186193
# CONFIG_SOC_NVIDIA_TEGRA210 is not set
194+
# CONFIG_SOC_QC_IPQ40XX is not set
187195
# CONFIG_SOC_QC_IPQ806X is not set
188196
# CONFIG_SOC_ROCKCHIP_RK3288 is not set
189197
# CONFIG_SOC_ROCKCHIP_RK3399 is not set
@@ -213,14 +221,15 @@ CONFIG_UDELAY_IO=y
213221
# CONFIG_UDELAY_TIMER2 is not set
214222
# CONFIG_TSC_SYNC_LFENCE is not set
215223
# CONFIG_TSC_SYNC_MFENCE is not set
224+
# CONFIG_NO_FIXED_XIP_ROM_SIZE is not set
216225
CONFIG_LOGICAL_CPUS=y
217226
# CONFIG_SMM_TSEG is not set
218227
# CONFIG_SMM_LAPIC_REMAP_MITIGATION is not set
219228
# CONFIG_SERIALIZED_SMM_INITIALIZATION is not set
220229
# CONFIG_X86_AMD_FIXED_MTRRS is not set
221230
# CONFIG_PLATFORM_USES_FSP1_0 is not set
222-
# CONFIG_BACKUP_DEFAULT_SMM_REGION is not set
223231
# CONFIG_MIRROR_PAYLOAD_TO_RAM_BEFORE_LOADING is not set
232+
# CONFIG_SOC_SETS_MSRS is not set
224233
CONFIG_CACHE_AS_RAM=y
225234
CONFIG_SMP=y
226235
CONFIG_AP_SIPI_VECTOR=0xfffff000
@@ -242,7 +251,6 @@ CONFIG_VIDEO_MB=0
242251
CONFIG_RAMBASE=0x100000
243252
# CONFIG_NORTHBRIDGE_INTEL_COMMON_MRC_CACHE is not set
244253
CONFIG_HPET_ADDRESS=0xfed00000
245-
CONFIG_HPET_MIN_TICKS=0x80
246254
CONFIG_MAX_PIRQ_LINKS=4
247255

248256
#
@@ -252,7 +260,7 @@ CONFIG_MAX_PIRQ_LINKS=4
252260
# CONFIG_SOUTHBRIDGE_AMD_CIMX_SB800 is not set
253261
# CONFIG_SOUTHBRIDGE_AMD_CIMX_SB900 is not set
254262
CONFIG_SOUTHBRIDGE_INTEL_COMMON=y
255-
# CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO is not set
263+
CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO=y
256264
CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
257265

258266
#
@@ -262,6 +270,11 @@ CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
262270
#
263271
# Embedded Controllers
264272
#
273+
CONFIG_VBOOT_VBNV_OFFSET=0x26
274+
# CONFIG_VBOOT_VBNV_CMOS is not set
275+
# CONFIG_VBOOT_VBNV_EC is not set
276+
# CONFIG_VBOOT_VBNV_FLASH is not set
277+
# CONFIG_VBOOT is not set
265278
# CONFIG_MAINBOARD_HAS_CHROMEOS is not set
266279
# CONFIG_UEFI_2_4_BINDING is not set
267280
# CONFIG_USE_SIEMENS_HWILIB is not set
@@ -321,10 +334,13 @@ CONFIG_ARCH_RAMSTAGE_X86_32=y
321334
# CONFIG_ROMCC is not set
322335
# CONFIG_LATE_CBMEM_INIT is not set
323336
CONFIG_PC80_SYSTEM=y
337+
# CONFIG_BOOTBLOCK_DEBUG_SPINLOOP is not set
338+
# CONFIG_BOOTBLOCK_SAVE_BIST_AND_TIMESTAMP is not set
324339
# CONFIG_HAVE_CMOS_DEFAULT is not set
325340
CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS=y
326-
CONFIG_VERSTAGE_ADDR=0x2000000
327341
# CONFIG_POSTCAR_STAGE is not set
342+
# CONFIG_VERSTAGE_DEBUG_SPINLOOP is not set
343+
# CONFIG_ROMSTAGE_DEBUG_SPINLOOP is not set
328344

329345
#
330346
# Devices
@@ -363,48 +379,52 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
363379
# CONFIG_GIC is not set
364380
# CONFIG_IPMI_KCS is not set
365381
# CONFIG_DRIVERS_LENOVO_WACOM is not set
382+
# CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS is not set
383+
# CONFIG_REALTEK_8168_RESET is not set
366384
# CONFIG_SPI_FLASH is not set
367385
# CONFIG_HAVE_SPI_CONSOLE_SUPPORT is not set
368386
CONFIG_DRIVERS_UART=y
369387
# CONFIG_NO_UART_ON_SUPERIO is not set
388+
# CONFIG_UART_OVERRIDE_INPUT_CLOCK_DIVIDER is not set
389+
# CONFIG_UART_OVERRIDE_REFCLK is not set
370390
# CONFIG_DRIVERS_UART_8250MEM is not set
371391
# CONFIG_DRIVERS_UART_8250MEM_32 is not set
372392
# CONFIG_HAVE_UART_SPECIAL is not set
373393
# CONFIG_DRIVERS_UART_OXPCIE is not set
374394
# CONFIG_DRIVERS_UART_PL011 is not set
395+
# CONFIG_UART_USE_REFCLK_AS_INPUT_CLOCK is not set
375396
CONFIG_HAVE_USBDEBUG=y
376397
CONFIG_HAVE_USBDEBUG_OPTIONS=y
377-
# CONFIG_DRIVER_XPOWERS_AXP209 is not set
378398
CONFIG_DRIVERS_EMULATION_QEMU_BOCHS=y
379399
# CONFIG_SMBIOS_PROVIDED_BY_MOBO is not set
400+
# CONFIG_DRIVERS_I2C_PCF8523 is not set
380401
# CONFIG_DRIVERS_I2C_RTD2132 is not set
381402
# CONFIG_INTEL_DP is not set
382403
# CONFIG_INTEL_DDI is not set
383404
# CONFIG_INTEL_EDID is not set
384405
# CONFIG_INTEL_INT15 is not set
385406
# CONFIG_INTEL_GMA_ACPI is not set
386407
# CONFIG_DRIVER_INTEL_I210 is not set
408+
CONFIG_DRIVERS_INTEL_WIFI=y
387409
# CONFIG_DRIVER_MAXIM_MAX77686 is not set
388410
# CONFIG_DRIVER_PARADE_PS8625 is not set
389411
# CONFIG_DRIVER_PARADE_PS8640 is not set
390412
CONFIG_DRIVERS_MC146818=y
391-
CONFIG_MAINBOARD_HAS_LPC_TPM=y
392-
CONFIG_LPC_TPM=y
393-
CONFIG_TPM_TIS_BASE_ADDRESS=0xfed40000
394-
# CONFIG_TPM_INIT_FAILURE_IS_FATAL is not set
395-
# CONFIG_SKIP_TPM_STARTUP_ON_NORMAL_BOOT is not set
396-
# CONFIG_TPM_DEACTIVATE is not set
413+
# CONFIG_MAINBOARD_HAS_LPC_TPM is not set
397414
# CONFIG_DRIVERS_RICOH_RCE822 is not set
415+
# CONFIG_DRIVER_SIEMENS_NC_FPGA is not set
398416
# CONFIG_DRIVERS_SIL_3114 is not set
399417
# CONFIG_DRIVER_TI_TPS65090 is not set
400418
# CONFIG_DRIVERS_TI_TPS65913 is not set
401419
# CONFIG_DRIVERS_TI_TPS65913_RTC is not set
420+
# CONFIG_DRIVER_XPOWERS_AXP209 is not set
421+
# CONFIG_ACPI_SATA_GENERATOR is not set
422+
# CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES is not set
402423
# CONFIG_RTC is not set
403424
# CONFIG_TPM is not set
404425
CONFIG_STACK_SIZE=0x1000
405426
CONFIG_MMCONF_SUPPORT_DEFAULT=y
406427
CONFIG_MMCONF_SUPPORT=y
407-
# CONFIG_BOOTMODE_STRAPS is not set
408428

409429
#
410430
# Console
@@ -433,8 +453,8 @@ CONFIG_TTYS0_BAUD=115200
433453
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
434454
CONFIG_CONSOLE_QEMU_DEBUGCON=y
435455
CONFIG_CONSOLE_QEMU_DEBUGCON_PORT=0x402
436-
# CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8 is not set
437-
CONFIG_DEFAULT_CONSOLE_LOGLEVEL_7=y
456+
CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
457+
# CONFIG_DEFAULT_CONSOLE_LOGLEVEL_7 is not set
438458
# CONFIG_DEFAULT_CONSOLE_LOGLEVEL_6 is not set
439459
# CONFIG_DEFAULT_CONSOLE_LOGLEVEL_5 is not set
440460
# CONFIG_DEFAULT_CONSOLE_LOGLEVEL_4 is not set
@@ -462,7 +482,6 @@ CONFIG_VGA=y
462482
CONFIG_HAVE_ACPI_TABLES=y
463483
# CONFIG_COMMON_FADT is not set
464484
# CONFIG_ACPI_NHLT is not set
465-
CONFIG_COREBOOT_TABLE_SIZE=0x8000
466485

467486
#
468487
# System tables
@@ -477,15 +496,17 @@ CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="QEMU x86 q35/ich9"
477496
#
478497
# CONFIG_PAYLOAD_NONE is not set
479498
# CONFIG_PAYLOAD_ELF is not set
499+
# CONFIG_PAYLOAD_BAYOU is not set
480500
# CONFIG_PAYLOAD_FILO is not set
481501
# CONFIG_PAYLOAD_GRUB2 is not set
482502
# CONFIG_PAYLOAD_SEABIOS is not set
483503
# CONFIG_PAYLOAD_UBOOT is not set
484504
CONFIG_PAYLOAD_LINUX=y
485505
# CONFIG_PAYLOAD_TIANOCORE is not set
486-
CONFIG_PAYLOAD_FILE="bzImage"
506+
CONFIG_PAYLOAD_FILE="./bzImage"
487507
CONFIG_PAYLOAD_OPTIONS=""
488-
CONFIG_LINUX_COMMAND_LINE="console=ttyS0"
508+
# CONFIG_PXE is not set
509+
CONFIG_LINUX_COMMAND_LINE="console=ttyS0 console=tty"
489510
CONFIG_LINUX_INITRD=""
490511
# CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
491512

@@ -495,6 +516,7 @@ CONFIG_LINUX_INITRD=""
495516
# CONFIG_COREINFO_SECONDARY_PAYLOAD is not set
496517
# CONFIG_MEMTEST_SECONDARY_PAYLOAD is not set
497518
# CONFIG_NVRAMCUI_SECONDARY_PAYLOAD is not set
519+
# CONFIG_TINT_SECONDARY_PAYLOAD is not set
498520

499521
#
500522
# Debugging
@@ -510,6 +532,7 @@ CONFIG_LINUX_INITRD=""
510532
# CONFIG_DEBUG_MALLOC is not set
511533
# CONFIG_DEBUG_ACPI is not set
512534
# CONFIG_TRACE is not set
535+
# CONFIG_DEBUG_BOOT_STATE is not set
513536
# CONFIG_ENABLE_APIC_EXT_ID is not set
514537
CONFIG_WARNINGS_ARE_ERRORS=y
515538
CONFIG_IASL_WARNINGS_ARE_ERRORS=y
@@ -519,4 +542,5 @@ CONFIG_IASL_WARNINGS_ARE_ERRORS=y
519542
# CONFIG_POWER_BUTTON_FORCE_DISABLE is not set
520543
# CONFIG_POWER_BUTTON_IS_OPTIONAL is not set
521544
# CONFIG_REG_SCRIPT is not set
522-
# CONFIG_DEBUG_BOOT_STATE is not set
545+
# CONFIG_CREATE_BOARD_CHECKLIST is not set
546+
# CONFIG_MAKE_CHECKLIST_PUBLIC is not set

0 commit comments

Comments
 (0)