volteer2.py: use add_fitimage.sh instead of add_fitimage_qs.sh
Remove unused volteer.py.
BUG=b:189405521
TEST=none
Cq-Depend: chrome-internal:3917503
Change-Id: I3eb3a8361b226bfb6ad4af3dd76176dedef093b5
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/dev-util/+/2976864
Tested-by: Nick Vaccaro <nvaccaro@google.com>
Reviewed-by: Nick Vaccaro <nvaccaro@google.com>
Reviewed-by: Zhuohao Lee <zhuohao@chromium.org>
Commit-Queue: Nick Vaccaro <nvaccaro@google.com>
diff --git a/contrib/variant/volteer.py b/contrib/variant/volteer.py
deleted file mode 100644
index 55bbafc..0000000
--- a/contrib/variant/volteer.py
+++ /dev/null
@@ -1,94 +0,0 @@
-# -*- coding: utf-8 -*-
-"""Define steps, package names, and directories for creating a Volteer variant
-
-Copyright 2020 The Chromium OS Authors. All rights reserved.
-Use of this source code is governed by a BSD-style license that can be
-found in the LICENSE file.
-"""
-
-from __future__ import print_function
-import step_names
-
-# Name of the baseboard
-base = 'volteer'
-
-# List of steps (named in step_names.py) to run in sequence to create
-# the new variant of the baseboard
-step_list = [
- step_names.PROJECT_CONFIG,
- step_names.FW_BUILD_CONFIG,
- step_names.CB_VARIANT,
- step_names.CB_CONFIG,
- step_names.ADD_FIT,
- step_names.GEN_FIT,
- step_names.COMMIT_FIT,
- step_names.EC_IMAGE,
- step_names.EMERGE,
- step_names.PUSH,
- step_names.UPLOAD,
- step_names.FIND,
- step_names.CALC_CQ_DEPEND,
- step_names.ADD_CQ_DEPEND,
- step_names.RE_UPLOAD,
- step_names.CLEAN_UP]
-
-# Base directory for coreboot
-coreboot_dir = 'third_party/coreboot'
-
-# Package name for FSP
-fsp = 'intel-tglfsp'
-
-# Package name for the fitimage
-fitimage_pkg = 'coreboot-private-files-baseboard-volteer'
-
-# Directory for fitimage; append '~/trunk/src/'' in chroot, '~/chromiumos/src'
-# outside
-fitimage_dir = 'private-overlays/baseboard-volteer-private/sys-boot/'\
- 'coreboot-private-files-baseboard-volteer'
-
-# Directory under fitimage_dir where gen_fit_image.sh leaves its outputs
-fitimage_outputs_dir = 'asset_generation/outputs'
-
-# Explanation of gen_fit_image command
-fitimage_cmd = './gen_fit_image.sh %s <path_to_fit_kit> -b'
-
-# Script to add fitimage sources
-fitimage_script = 'files/add_fitimage_es2.sh'
-
-# List of packages to cros_workon
-workon_pkgs = [
- 'coreboot', 'libpayload', 'vboot_reference', 'depthcharge', fsp,
- fitimage_pkg, 'chromeos-ec', 'chromeos-config-bsp-volteer-private']
-
-# The emerge command
-emerge_cmd = 'emerge-volteer'
-
-# List of packages to emerge
-emerge_pkgs = [
- 'coreboot', 'libpayload', 'vboot_reference', 'depthcharge', fsp,
- fitimage_pkg, 'chromeos-ec', 'chromeos-config-bsp-volteer-private',
- 'chromeos-config', 'chromeos-config-bsp', 'coreboot-private-files',
- 'chromeos-bootimage']
-
-# List of packages to cros_workon to build the project config
-config_workon_pkgs = ['chromeos-config-bsp-volteer-private']
-
-# List of packages to emerge to build the project config
-config_emerge_pkgs = ['chromeos-config-bsp-volteer-private']
-
-# List of commits that will be uploaded with `repo upload`
-repo_upload_list = [
- step_names.CB_CONFIG, step_names.COMMIT_FIT,
- step_names.EC_IMAGE, step_names.FW_BUILD_CONFIG]
-
-# List of commits that will be pushed to review.coreboot.org
-coreboot_push_list = [step_names.CB_VARIANT]
-
-# List of steps that depend on other steps, and what those are.
-# This list gets used for setting up Cq-Depend on the uploaded CLs.
-depends = {
- step_names.CB_CONFIG: [step_names.FIND],
- step_names.FW_BUILD_CONFIG: [
- step_names.FIND, step_names.CB_CONFIG,
- step_names.COMMIT_FIT, step_names.EC_IMAGE]
-}
diff --git a/contrib/variant/volteer2.py b/contrib/variant/volteer2.py
index 3ace919..31956b9 100644
--- a/contrib/variant/volteer2.py
+++ b/contrib/variant/volteer2.py
@@ -60,7 +60,7 @@
fitimage_cmd = './gen_fit_image.sh %s <path_to_fit_kit> -b'
# Script to add fitimage sources
-fitimage_script = 'files/add_fitimage_qs.sh'
+fitimage_script = 'files/add_fitimage.sh'
# List of packages to cros_workon
workon_pkgs = [
