lkt: arm: Handle dtb location shift

Signed-off-by: Nathan Chancellor <nathan@kernel.org>
nathanchance · Jun 30, 2023 · 3329050 · 3329050
1 parent c4e4802
commit 3329050
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/lkt/arm.py b/lkt/arm.py
@@ -47,10 +47,13 @@ def _add_defconfig_runners(self):
             runner.boot_arch = boot_arch
             runner.configs = [config_target]
             if self.only_test_boot:
+                # https://git.kernel.org/linus/724ba6751532055db75992fc6ae21c3e322e94a7
+                dtb_prefix = 'aspeed/' if Path(self.folders.source,
+                                               'arch/arm/boot/dts/aspeed').is_dir() else ''
                 if config_target == 'multi_v5_defconfig':
-                    runner.make_targets.append('aspeed-bmc-opp-palmetto.dtb')
+                    runner.make_targets.append(f"{dtb_prefix}aspeed-bmc-opp-palmetto.dtb")
                 elif config_target == 'aspeed_g5_defconfig':
-                    runner.make_targets.append('aspeed-bmc-opp-romulus.dtb')
+                    runner.make_targets.append(f"{dtb_prefix}aspeed-bmc-opp-romulus.dtb")
             runners.append(runner)
 
         # https://github.com/ClangBuiltLinux/linux/issues/325