Commit 7f424c66 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'linux_kselftest-kunit-fixes-6.15-rc3' of... 

Merge tag 'linux_kselftest-kunit-fixes-6.15-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest

Pull kunit fix from Shuah Khan:
 "Fixes arch sh kunit qemu_configs script sh.py to honor kunit cmdline"

* tag 'linux_kselftest-kunit-fixes-6.15-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest:
  kunit: qemu_configs: SH: Respect kunit cmdline
parents 338d40ce b26c1a85

tools/testing/kunit/qemu_configs/sh.py

+3 −1
Original line number Diff line number Diff line
@@ -7,7 +7,9 @@ CONFIG_CPU_SUBTYPE_SH7751R=y 
CONFIG_MEMORY_START=0x0c000000

CONFIG_SH_RTS7751R2D=y

CONFIG_RTS7751R2D_PLUS=y

CONFIG_SERIAL_SH_SCI=y''',

CONFIG_SERIAL_SH_SCI=y

CONFIG_CMDLINE_EXTEND=y

''',

			   qemu_arch='sh4',

			   kernel_path='arch/sh/boot/zImage',

			   kernel_command_line='console=ttySC1',