lkt: Update for CONFIG_SERIAL_PMACZILOG=y in -next

Signed-off-by: Nathan Chancellor <nathan@kernel.org>
nathanchance · Aug 28, 2023 · b738aae · b738aae
1 parent d1890f8
commit b738aae
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/lkt/powerpc.py b/lkt/powerpc.py
@@ -109,11 +109,12 @@ def _add_defconfig_runners(self):
             runner.bootable = self._llvm_version >= (14, 0, 0)
             if not runner.bootable:
                 runner.result['boot'] = 'skipped due to LLVM < 14.0.0 (lack of 1e3c6fc7cb9d2)'
-            runner.configs = [
-                'pmac32_defconfig',
-                'CONFIG_SERIAL_PMACZILOG=y',
-                'CONFIG_SERIAL_PMACZILOG_CONSOLE=y',
-            ]
+            runner.configs = ['pmac32_defconfig']
+            if '0b5e06e9cb156' not in self.lsm.commits:
+                runner.configs += [
+                    'CONFIG_SERIAL_PMACZILOG=y',
+                    'CONFIG_SERIAL_PMACZILOG_CONSOLE=y',
+                ]
             runner.image_target = 'vmlinux'
             runner.only_test_boot = self.only_test_boot
             runner.qemu_arch = 'ppc'

diff --git a/lkt/source.py b/lkt/source.py
@@ -88,6 +88,12 @@ def __init__(self, linux_source):
         self._add_commit('0355785313e21', r"LDFLAGS_vmlinux-\$\(CONFIG_RELOCATABLE\) \+= -z notext",
                          'arch/powerpc/Makefile')
 
+        # Introduced by: powerpc/pmac32: enable serial options by default in defconfig
+        # Link: https://git.kernel.org/linus/0b5e06e9cb156e7e97bfb4e1ebf6acd62497eaf5
+        # First appeared: next-20230815~142^2~5
+        self._add_commit('0b5e06e9cb156', 'CONFIG_SERIAL_PMACZILOG_CONSOLE=y',
+                         'arch/powerpc/configs/pmac32_defconfig')
+
         # Introduced by: powerpc/64: Make VDSO32 track COMPAT on 64-bit
         # Link: https://git.kernel.org/linus/231b232df8f67e7d37af01259c21f2a131c3911e
         # First appeared: v5.10-rc1~105^2~141