From 1e89c29ed78e9b4b3ba4fbb1d3bc2b3b238100a2 Mon Sep 17 00:00:00 2001 From: chenpan0560 Date: Tue, 17 May 2022 10:06:26 +0800 Subject: [PATCH] fix:product name of l2 has been modified, the configuration file needs to be modified(Hi3516DV300 modify hispark_taurus_standard) Signed-off-by: chenpan0560 --- .../command_line/hdf_linux_scann.py | 2 +- tools/hdf_dev_eco_tool/resources/settings.json | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/tools/hdf_dev_eco_tool/command_line/hdf_linux_scann.py b/tools/hdf_dev_eco_tool/command_line/hdf_linux_scann.py index 381c9f30..940b113c 100644 --- a/tools/hdf_dev_eco_tool/command_line/hdf_linux_scann.py +++ b/tools/hdf_dev_eco_tool/command_line/hdf_linux_scann.py @@ -96,7 +96,7 @@ class HdfLinuxScan(object): get_config_config_path(root=self.root, kernel=self.kernel) for roots, dirs, files in os.walk(config_path): for file_name in files: - if file_name.strip() == "hi3516dv300_small_defconfig": + if file_name.endswith("small_defconfig"): model_defconfig_list.append(os.path.join(roots, file_name)) return model_defconfig_list diff --git a/tools/hdf_dev_eco_tool/resources/settings.json b/tools/hdf_dev_eco_tool/resources/settings.json index fc9bce57..aa3f6fda 100644 --- a/tools/hdf_dev_eco_tool/resources/settings.json +++ b/tools/hdf_dev_eco_tool/resources/settings.json @@ -10,25 +10,25 @@ "hispark_taurus_linux": { "board_parent_path": "vendor/hisilicon/hispark_taurus_linux/hdf_config/device_info", "dot_config_path": "kernel/linux", - "patch_and_config": ["hi3516dv300.patch", "hi3516dv300_small_defconfig"] + "patch_and_config": ["hispark_taurus.patch", "hispark_taurus_small_defconfig"] }, - "Hi3516DV300_kernel": { - "board_parent_path": "vendor/hisilicon/Hi3516DV300/hdf_config/khdf/device_info", + "hispark_taurus_standard_kernel": { + "board_parent_path": "vendor/hisilicon/hispark_taurus_standard/hdf_config/khdf/device_info", "dot_config_path": "kernel/linux", - "patch_and_config": ["hi3516dv300.patch", "hi3516dv300_standard_defconfig"] + "patch_and_config": ["hispark_taurus.patch", "hispark_taurus_standard_defconfig"] }, - "Hi3516DV300_user": { - "board_parent_path": "vendor/hisilicon/Hi3516DV300/hdf_config/uhdf", + "hispark_taurus_standard_user": { + "board_parent_path": "vendor/hisilicon/hispark_taurus_standard/hdf_config/uhdf", "dot_config_path": "", "patch_and_config": [] }, "rk3568_kernel": { - "board_parent_path": "vendor/hisilicon/Hi3516DV300/hdf_config/khdf/device_info", + "board_parent_path": "vendor/hisilicon/hispark_taurus_standard/hdf_config/khdf/device_info", "dot_config_path": "kernel/linux", - "patch_and_config": ["hi3516dv300.patch", "hi3516dv300_standard_defconfig"] + "patch_and_config": ["hispark_taurus.patch", "hispark_taurus_standard_defconfig"] }, "rk3568_user": { - "board_parent_path": "vendor/hisilicon/Hi3516DV300/hdf_config/uhdf", + "board_parent_path": "vendor/hisilicon/hispark_taurus_standard/hdf_config/uhdf", "dot_config_path": "", "patch_and_config": [] }