From 008410467940549ea66e65968dc0973ec2ceca11 Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Tue, 9 Mar 2021 19:44:26 +0100 Subject: dashboard/config/linux: re-organize CMDLINE parameters Move x86-specific cmdline parameter to x86_64.yml. Remove redundant cmdline parameters (defined by kernel configs). Move vivid/nr_devs parameters to arch configs. Disable bluetooth/wireless/hamradio in non-x86 configs, non-x86 instances are slow, so the intention is to reduce test space. --- dashboard/config/linux/android-5.4.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'dashboard/config/linux/android-5.4.config') diff --git a/dashboard/config/linux/android-5.4.config b/dashboard/config/linux/android-5.4.config index ba0bfcbf3..5e2e20a82 100644 --- a/dashboard/config/linux/android-5.4.config +++ b/dashboard/config/linux/android-5.4.config @@ -441,7 +441,7 @@ CONFIG_LEGACY_VSYSCALL_EMULATE=y # CONFIG_LEGACY_VSYSCALL_XONLY is not set # CONFIG_LEGACY_VSYSCALL_NONE is not set CONFIG_CMDLINE_BOOL=y -CONFIG_CMDLINE="earlyprintk=serial oops=panic nmi_watchdog=panic panic=86400 net.ifnames=0 sysctl.kernel.hung_task_all_cpu_backtrace=1 ima_policy=tcb kvm-intel.nested=1 nf-conntrack-ftp.ports=20000 nf-conntrack-tftp.ports=20000 nf-conntrack-sip.ports=20000 nf-conntrack-irc.ports=20000 nf-conntrack-sane.ports=20000 vivid.n_devs=16 vivid.multiplanar=1,2,1,2,1,2,1,2,1,2,1,2,1,2,1,2 netrom.nr_ndevs=16 rose.rose_ndevs=16 spec_store_bypass_disable=prctl numa=fake=2 nopcid dummy_hcd.num=8 binder.debug_mask=0 rcupdate.rcu_expedited=1 root=/dev/sda console=ttyS0 vsyscall=native watchdog_thresh=55 workqueue.watchdog_thresh=140" +CONFIG_CMDLINE="earlyprintk=serial net.ifnames=0 sysctl.kernel.hung_task_all_cpu_backtrace=1 ima_policy=tcb nf-conntrack-ftp.ports=20000 nf-conntrack-tftp.ports=20000 nf-conntrack-sip.ports=20000 nf-conntrack-irc.ports=20000 nf-conntrack-sane.ports=20000 binder.debug_mask=0 rcupdate.rcu_expedited=1 root=/dev/sda console=ttyS0 vsyscall=native numa=fake=2 kvm-intel.nested=1 spec_store_bypass_disable=prctl nopcid vivid.n_devs=16 vivid.multiplanar=1,2,1,2,1,2,1,2,1,2,1,2,1,2,1,2 netrom.nr_ndevs=16 rose.rose_ndevs=16 dummy_hcd.num=8 watchdog_thresh=55 workqueue.watchdog_thresh=140" # CONFIG_CMDLINE_OVERRIDE is not set CONFIG_MODIFY_LDT_SYSCALL=y CONFIG_HAVE_LIVEPATCH=y -- cgit mrf-deployment