gitlab: Add a StarFive VisionFive2 to the sjg lab

I have one of these boards loaded with Ubuntu 24.10 (64-bit). Add an
entry for it so that it can be used for testing.

Series-to: u-boot
Series-cc: trini, heinrich
Cover-letter:
gitlab: Fixes to get StarFive VisionFive2 into the sjg lab
This board fought valiantly against attempts to add it to my lab. After
several hours of debugging, I found problems in the Labgrid integration
(not included here), test.py and buildman

This series fixes these and the board now seems to be reliable enough.

Note that the board fails test_dm_compat

Link: https://github.com/labgrid-project/labgrid/pull/1411
END

Signed-off-by: Simon Glass <sjg@chromium.org>

.gitlab-ci.yml

@@ -692,24 +692,7 @@ nyan-big:
     ROLE: nyan-big
   <<: *lab_dfn
 
-rpi:
+vision5:
   variables:
-    ROLE: rpi
-  <<: *lab_dfn
-
-# StarFive VisionFive 2
-vf2:
-  variables:
-    ROLE: vf2
-  <<: *lab_dfn
-
-colibrimx8:
-  variables:
-    ROLE: colibrimx8
-  <<: *lab_dfn
-
-# NVIDIA Jetson TK1
-tk1:
-  variables:
-    ROLE: tk1
+    ROLE: vision5
   <<: *lab_dfn

tools/buildman/builder.py

@@ -265,7 +265,7 @@ class Builder:
                  reproducible_builds=False, force_build=False,
                  force_build_failures=False, force_reconfig=False,
                  in_tree=False, force_config_on_failure=False, make_func=None,
-                 dtc_skip=False, build_target=None):
+                 dtc_skip=False):
         """Create a new Builder object
 
         Args:
@@ -315,7 +315,6 @@ class Builder:
                 retrying a failed build
             make_func (function): Function to call to run 'make'
             dtc_skip (bool): True to skip building dtc and use the system one
-            build_target (str): Build target to use (None to use the default)
         """
         self.toolchains = toolchains
         self.base_dir = base_dir
@@ -364,7 +363,6 @@ class Builder:
                 raise ValueError('Cannot find dtc')
         else:
             self.dtc = None
-        self.build_target = build_target
 
         if not self.squash_config_y:
             self.config_filenames += EXTRA_CONFIG_FILENAMES

tools/buildman/builderthread.py

@@ -286,8 +286,6 @@ class BuilderThread(threading.Thread):
         """
         if config_only:
             args.append('cfg')
-        elif self.builder.build_target:
-            args.append(self.builder.build_target)
         result = self.make(commit, brd, 'build', cwd, *args, env=env)
         cmd_list.append([self.builder.gnu_make] + args)
         if (result.return_code == 2 and

tools/buildman/buildman.rst

@@ -1329,10 +1329,6 @@ sometimes useful to have buildman wait until the others have finished. Use the
 --process-limit option for this: --process-limit 1 will allow only one buildman
 to process jobs at a time.
 
-To build a particular target, rather than the default U-Boot target, use the
-`--target` option. This is unlikely to be useful unless you are building a
-single board.
-
 Build summary
 -------------
 

tools/buildman/cmdline.py

@@ -22,7 +22,6 @@ def add_upto_m(parser):
 
     This is split out to avoid having too many statements in one function
     """
-    # Available JqzZ
     parser.add_argument('-a', '--adjust-cfg', type=str, action='append',
           help='Adjust the Kconfig settings in .config before building')
     parser.add_argument('-A', '--print-prefix', action='store_true',
@@ -154,8 +153,6 @@ def add_after_m(parser):
     parser.add_argument('-T', '--threads', type=int,
           default=None,
           help='Number of builder threads to use (0=single-thread)')
-    parser.add_argument('--target', type=str,
-          default=None, help='Build target to use')
     parser.add_argument('-u', '--show_unknown', action='store_true',
           default=False, help='Show boards with unknown build result')
     parser.add_argument('-U', '--show-environment', action='store_true',

tools/buildman/control.py

@@ -785,9 +785,6 @@ def do_buildman(args, toolchains=None, make_func=None, brds=None,
                      args.verbose)
         return 0
 
-    if args.config_only and args.target:
-        raise ValueError('Cannot use --config-only with --target')
-
     # Create a new builder with the selected args
     builder = Builder(toolchains, output_dir, git_dir,
             args.threads, args.jobs, checkout=True,
@@ -813,7 +810,7 @@ def do_buildman(args, toolchains=None, make_func=None, brds=None,
             force_build_failures = args.force_build_failures,
             force_reconfig = args.force_reconfig, in_tree = args.in_tree,
             force_config_on_failure=not args.quick, make_func=make_func,
-            dtc_skip=args.dtc_skip, build_target=args.target)
+            dtc_skip=args.dtc_skip)
 
     TEST_BUILDER = builder
 

tools/buildman/func_test.py

@@ -1152,13 +1152,3 @@ CONFIG_SOC="fred"
             'board': 'ARM Board 0',
             'config': 'config0',
             'target': 'board0'}, []), res)
-
-    def testTarget(self):
-        """Test that the --target flag works"""
-        lines = self.check_command('--target', 'u-boot.dtb')[0]
-
-        # It should not affect the defconfig line
-        self.assertNotIn(b'u-boot.dtb', lines[0])
-
-        # It should appear at the end of the build line
-        self.assertEqual(b'u-boot.dtb', lines[1].split()[-1])