Skip to content

Commit f2dd9c7

Browse files
committed
qemu: apply changes from linuxboot#1816 to qemu for everything testing but flashrom
Apply previous patch: patch config/linux-qemu.config patch Apply changes: docker run -e DISPLAY=$DISPLAY --network host --rm -ti -v $(pwd):$(pwd) -w $(pwd) tlaurion/heads-dev-env:latest -- make BOARD=qemu-coreboot-whiptail-tpm1 linux.modify_and_save_oldconfig_in_place Review changes, build: docker run -e DISPLAY=$DISPLAY --network host --rm -ti -v $(pwd):$(pwd) -w $(pwd) tlaurion/heads-dev-env:latest -- make BOARD=qemu-coreboot-whiptail-tpm1 Run: docker run -e DISPLAY=$DISPLAY --network host --rm -ti -v $(pwd):$(pwd) -w $(pwd) tlaurion/heads-dev-env:latest -- make BOARD=qemu-coreboot-whiptail-tpm1 run Signed-off-by: Thierry Laurion <insurgo@riseup.net>
1 parent 3f47051 commit f2dd9c7

1 file changed

Lines changed: 40 additions & 38 deletions

File tree

config/linux-qemu.config

Lines changed: 40 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ CONFIG_PREEMPT_NONE=y
116116
# CONFIG_PREEMPT_VOLUNTARY is not set
117117
# CONFIG_PREEMPT is not set
118118
# CONFIG_PREEMPT_DYNAMIC is not set
119-
# CONFIG_SCHED_CORE is not set
119+
CONFIG_SCHED_CORE=y
120120

121121
#
122122
# CPU/Task time and stats accounting
@@ -633,7 +633,7 @@ CONFIG_SOFTIRQ_ON_OWN_STACK=y
633633
CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
634634
CONFIG_HAVE_ARCH_MMAP_RND_BITS=y
635635
CONFIG_HAVE_EXIT_THREAD=y
636-
CONFIG_ARCH_MMAP_RND_BITS=28
636+
CONFIG_ARCH_MMAP_RND_BITS=32
637637
CONFIG_PAGE_SIZE_LESS_THAN_64KB=y
638638
CONFIG_PAGE_SIZE_LESS_THAN_256KB=y
639639
CONFIG_HAVE_OBJTOOL=y
@@ -773,14 +773,14 @@ CONFIG_SWAP=y
773773
# CONFIG_SLAB is not set
774774
CONFIG_SLUB=y
775775
# CONFIG_SLOB is not set
776-
CONFIG_SLAB_MERGE_DEFAULT=y
777-
# CONFIG_SLAB_FREELIST_RANDOM is not set
778-
# CONFIG_SLAB_FREELIST_HARDENED is not set
776+
# CONFIG_SLAB_MERGE_DEFAULT is not set
777+
CONFIG_SLAB_FREELIST_RANDOM=y
778+
CONFIG_SLAB_FREELIST_HARDENED=y
779779
# CONFIG_SLUB_STATS is not set
780780
CONFIG_SLUB_CPU_PARTIAL=y
781781
# end of SLAB allocator options
782782

783-
# CONFIG_SHUFFLE_PAGE_ALLOCATOR is not set
783+
CONFIG_SHUFFLE_PAGE_ALLOCATOR=y
784784
# CONFIG_COMPAT_BRK is not set
785785
CONFIG_SPARSEMEM=y
786786
CONFIG_SPARSEMEM_EXTREME=y
@@ -852,7 +852,7 @@ CONFIG_INET=y
852852
# CONFIG_IP_PNP is not set
853853
# CONFIG_NET_IPIP is not set
854854
# CONFIG_NET_IPGRE_DEMUX is not set
855-
CONFIG_SYN_COOKIES=y
855+
# CONFIG_SYN_COOKIES is not set
856856
# CONFIG_NET_IPVTI is not set
857857
# CONFIG_NET_FOU is not set
858858
# CONFIG_INET_AH is not set
@@ -1114,7 +1114,7 @@ CONFIG_BLK_DEV=y
11141114
CONFIG_CDROM=y
11151115
# CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set
11161116
CONFIG_BLK_DEV_LOOP=y
1117-
CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
1117+
CONFIG_BLK_DEV_LOOP_MIN_COUNT=4
11181118
# CONFIG_BLK_DEV_DRBD is not set
11191119
# CONFIG_BLK_DEV_NBD is not set
11201120
CONFIG_BLK_DEV_RAM=y
@@ -1383,7 +1383,7 @@ CONFIG_ETHERNET=y
13831383
# CONFIG_NET_VENDOR_AMD is not set
13841384
# CONFIG_NET_VENDOR_AQUANTIA is not set
13851385
# CONFIG_NET_VENDOR_ARC is not set
1386-
# CONFIG_NET_VENDOR_ASIX is not set
1386+
CONFIG_NET_VENDOR_ASIX=y
13871387
# CONFIG_NET_VENDOR_ATHEROS is not set
13881388
# CONFIG_CX_ECAT is not set
13891389
# CONFIG_NET_VENDOR_BROADCOM is not set
@@ -1392,14 +1392,16 @@ CONFIG_ETHERNET=y
13921392
# CONFIG_NET_VENDOR_CHELSIO is not set
13931393
# CONFIG_NET_VENDOR_CISCO is not set
13941394
# CONFIG_NET_VENDOR_CORTINA is not set
1395-
# CONFIG_NET_VENDOR_DAVICOM is not set
1395+
CONFIG_NET_VENDOR_DAVICOM=y
13961396
# CONFIG_DNET is not set
13971397
# CONFIG_NET_VENDOR_DEC is not set
13981398
# CONFIG_NET_VENDOR_DLINK is not set
13991399
# CONFIG_NET_VENDOR_EMULEX is not set
1400-
# CONFIG_NET_VENDOR_ENGLEDER is not set
1400+
CONFIG_NET_VENDOR_ENGLEDER=y
1401+
# CONFIG_TSNEP is not set
14011402
# CONFIG_NET_VENDOR_EZCHIP is not set
1402-
# CONFIG_NET_VENDOR_FUNGIBLE is not set
1403+
CONFIG_NET_VENDOR_FUNGIBLE=y
1404+
# CONFIG_FUN_ETH is not set
14031405
# CONFIG_NET_VENDOR_GOOGLE is not set
14041406
# CONFIG_NET_VENDOR_HUAWEI is not set
14051407
# CONFIG_NET_VENDOR_I825XX is not set
@@ -1418,15 +1420,17 @@ CONFIG_IGB=m
14181420
# CONFIG_ICE is not set
14191421
# CONFIG_FM10K is not set
14201422
# CONFIG_IGC is not set
1421-
# CONFIG_NET_VENDOR_WANGXUN is not set
1423+
CONFIG_NET_VENDOR_WANGXUN=y
1424+
# CONFIG_NGBE is not set
1425+
# CONFIG_TXGBE is not set
14221426
# CONFIG_JME is not set
1423-
# CONFIG_NET_VENDOR_LITEX is not set
1427+
CONFIG_NET_VENDOR_LITEX=y
14241428
# CONFIG_NET_VENDOR_MARVELL is not set
14251429
# CONFIG_NET_VENDOR_MELLANOX is not set
14261430
# CONFIG_NET_VENDOR_MICREL is not set
14271431
# CONFIG_NET_VENDOR_MICROCHIP is not set
14281432
# CONFIG_NET_VENDOR_MICROSEMI is not set
1429-
# CONFIG_NET_VENDOR_MICROSOFT is not set
1433+
CONFIG_NET_VENDOR_MICROSOFT=y
14301434
# CONFIG_NET_VENDOR_MYRI is not set
14311435
# CONFIG_FEALNX is not set
14321436
# CONFIG_NET_VENDOR_NI is not set
@@ -1457,7 +1461,7 @@ CONFIG_IGB=m
14571461
# CONFIG_NET_VENDOR_SYNOPSYS is not set
14581462
# CONFIG_NET_VENDOR_TEHUTI is not set
14591463
# CONFIG_NET_VENDOR_TI is not set
1460-
# CONFIG_NET_VENDOR_VERTEXCOM is not set
1464+
CONFIG_NET_VENDOR_VERTEXCOM=y
14611465
# CONFIG_NET_VENDOR_VIA is not set
14621466
# CONFIG_NET_VENDOR_WIZNET is not set
14631467
# CONFIG_NET_VENDOR_XILINX is not set
@@ -1570,7 +1574,7 @@ CONFIG_HW_CONSOLE=y
15701574
CONFIG_VT_HW_CONSOLE_BINDING=y
15711575
CONFIG_UNIX98_PTYS=y
15721576
# CONFIG_LEGACY_PTYS is not set
1573-
CONFIG_LDISC_AUTOLOAD=y
1577+
# CONFIG_LDISC_AUTOLOAD is not set
15741578

15751579
#
15761580
# Serial drivers
@@ -1594,7 +1598,7 @@ CONFIG_SERIAL_8250_EXTENDED=y
15941598
# CONFIG_SERIAL_8250_RT288X is not set
15951599
# CONFIG_SERIAL_8250_LPSS is not set
15961600
# CONFIG_SERIAL_8250_MID is not set
1597-
# CONFIG_SERIAL_8250_PERICOM is not set
1601+
CONFIG_SERIAL_8250_PERICOM=y
15981602

15991603
#
16001604
# Non-8250 serial port support
@@ -1947,18 +1951,13 @@ CONFIG_APERTURE_HELPERS=y
19471951
#
19481952
# end of ARM devices
19491953

1950-
CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y
1951-
19521954
#
19531955
# Frame buffer Devices
19541956
#
19551957
CONFIG_FB_CMDLINE=y
19561958
CONFIG_FB_NOTIFY=y
19571959
CONFIG_FB=y
19581960
# CONFIG_FIRMWARE_EDID is not set
1959-
CONFIG_FB_CFB_FILLRECT=y
1960-
CONFIG_FB_CFB_COPYAREA=y
1961-
CONFIG_FB_CFB_IMAGEBLIT=y
19621961
# CONFIG_FB_FOREIGN_ENDIAN is not set
19631962
# CONFIG_FB_MODE_HELPERS is not set
19641963
# CONFIG_FB_TILEBLITTING is not set
@@ -1974,7 +1973,7 @@ CONFIG_FB_CFB_IMAGEBLIT=y
19741973
# CONFIG_FB_IMSTT is not set
19751974
# CONFIG_FB_VGA16 is not set
19761975
# CONFIG_FB_VESA is not set
1977-
CONFIG_FB_EFI=y
1976+
# CONFIG_FB_EFI is not set
19781977
# CONFIG_FB_N411 is not set
19791978
# CONFIG_FB_HGA is not set
19801979
# CONFIG_FB_OPENCORES is not set
@@ -2023,11 +2022,7 @@ CONFIG_VGA_CONSOLE=y
20232022
CONFIG_DUMMY_CONSOLE=y
20242023
CONFIG_DUMMY_CONSOLE_COLUMNS=80
20252024
CONFIG_DUMMY_CONSOLE_ROWS=25
2026-
CONFIG_FRAMEBUFFER_CONSOLE=y
2027-
CONFIG_FRAMEBUFFER_CONSOLE_LEGACY_ACCELERATION=y
2028-
CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
2029-
# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
2030-
# CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER is not set
2025+
# CONFIG_FRAMEBUFFER_CONSOLE is not set
20312026
# end of Console display driver support
20322027

20332028
# CONFIG_LOGO is not set
@@ -2447,7 +2442,10 @@ CONFIG_VHOST_MENU=y
24472442
# CONFIG_STAGING is not set
24482443
# CONFIG_CHROME_PLATFORMS is not set
24492444
# CONFIG_MELLANOX_PLATFORM is not set
2450-
# CONFIG_SURFACE_PLATFORMS is not set
2445+
CONFIG_SURFACE_PLATFORMS=y
2446+
# CONFIG_SURFACE_3_POWER_OPREGION is not set
2447+
# CONFIG_SURFACE_GPE is not set
2448+
# CONFIG_SURFACE_PRO3_BUTTON is not set
24512449
CONFIG_X86_PLATFORM_DEVICES=y
24522450
# CONFIG_ACPI_WMI is not set
24532451
# CONFIG_ACERHDF is not set
@@ -2665,7 +2663,7 @@ CONFIG_LIBNVDIMM=y
26652663
# CONFIG_BTT is not set
26662664
CONFIG_DAX=y
26672665
CONFIG_NVMEM=y
2668-
# CONFIG_NVMEM_SYSFS is not set
2666+
CONFIG_NVMEM_SYSFS=y
26692667
# CONFIG_NVMEM_RMEM is not set
26702668

26712669
#
@@ -2851,7 +2849,7 @@ CONFIG_SECURITYFS=y
28512849
# CONFIG_INTEL_TXT is not set
28522850
CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y
28532851
CONFIG_HARDENED_USERCOPY=y
2854-
# CONFIG_FORTIFY_SOURCE is not set
2852+
CONFIG_FORTIFY_SOURCE=y
28552853
# CONFIG_STATIC_USERMODEHELPER is not set
28562854
# CONFIG_IMA_SECURE_AND_OR_TRUSTED_BOOT is not set
28572855
CONFIG_DEFAULT_SECURITY_DAC=y
@@ -2869,8 +2867,8 @@ CONFIG_INIT_STACK_NONE=y
28692867
# CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF is not set
28702868
# CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL is not set
28712869
# CONFIG_GCC_PLUGIN_STACKLEAK is not set
2872-
# CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set
2873-
# CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
2870+
CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y
2871+
CONFIG_INIT_ON_FREE_DEFAULT_ON=y
28742872
# end of Memory initialization
28752873

28762874
CONFIG_RANDSTRUCT_NONE=y
@@ -2925,7 +2923,7 @@ CONFIG_CRYPTO_SIMD=y
29252923
#
29262924
# Block ciphers
29272925
#
2928-
CONFIG_CRYPTO_AES=y
2926+
# CONFIG_CRYPTO_AES is not set
29292927
# CONFIG_CRYPTO_AES_TI is not set
29302928
# CONFIG_CRYPTO_ARIA is not set
29312929
# CONFIG_CRYPTO_BLOWFISH is not set
@@ -3166,9 +3164,8 @@ CONFIG_HAVE_GENERIC_VDSO=y
31663164
CONFIG_GENERIC_GETTIMEOFDAY=y
31673165
CONFIG_GENERIC_VDSO_TIME_NS=y
31683166
CONFIG_FONT_SUPPORT=y
3169-
# CONFIG_FONTS is not set
3170-
CONFIG_FONT_8x8=y
31713167
CONFIG_FONT_8x16=y
3168+
CONFIG_FONT_AUTOSELECT=y
31723169
CONFIG_SG_POOL=y
31733170
CONFIG_ARCH_HAS_PMEM_API=y
31743171
CONFIG_MEMREGION=y
@@ -3287,7 +3284,12 @@ CONFIG_CC_HAS_KASAN_GENERIC=y
32873284
CONFIG_CC_HAS_WORKING_NOSANITIZE_ADDRESS=y
32883285
# CONFIG_KASAN is not set
32893286
CONFIG_HAVE_ARCH_KFENCE=y
3290-
# CONFIG_KFENCE is not set
3287+
CONFIG_KFENCE=y
3288+
CONFIG_KFENCE_SAMPLE_INTERVAL=100
3289+
CONFIG_KFENCE_NUM_OBJECTS=255
3290+
# CONFIG_KFENCE_DEFERRABLE is not set
3291+
# CONFIG_KFENCE_STATIC_KEYS is not set
3292+
CONFIG_KFENCE_STRESS_TEST_FAULTS=0
32913293
CONFIG_HAVE_ARCH_KMSAN=y
32923294
# end of Memory Debugging
32933295

0 commit comments

Comments
 (0)