mirror/u-boot-2016
1
0
Fork 0
mirror of https://git.codelinaro.org/clo/qsdk/oss/boot/u-boot-2016.git synced 2026-03-14 21:10:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge "tools: pack: flash bootconfig only for non-apps image"

Browse source
This commit is contained in:
Linux Build Service Account 2024-01-11 23:40:11 -08:00 • committed by Gerrit - the friendly Code Review server
commit 338b8819d6
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
tools/pack.py
View file

@ -1600,7 +1600,7 @@ class Pack(object):
if (multi_wifi_fw == "true" or tiny_16m == "true") and 'wififw_type_min' in section.attrib:
wifi_fw_type_min = section.attrib['wififw_type_min']
wifi_fw_type_max = section.attrib['wififw_type_max']
elif 'bootconfig_type_max' in section.attrib:
elif 'bootconfig_type_max' in section.attrib and image_type == "all":
partition = section.attrib['label']
else:
try:
@ -2122,7 +2122,7 @@ class Pack(object):
wifi_fw_type_min = section.attrib['wififw_type_min']
wifi_fw_type_max = section.attrib['wififw_type_max']
partition = section.attrib['label']
elif "bootconfig_type_max" in section.attrib:
elif "bootconfig_type_max" in section.attrib and image_type == "all":
partition = section.attrib['label']
else:
try:
@ -2168,11 +2168,10 @@ class Pack(object):
if section_conf == "bootconfig" or section_conf == "bootconfig1":
try:
if image_type == "all" or section[8].attrib['image_type'] == image_type:
ret = self.__gen_script_bootconfig(images, flinfo, partition, section)
if ret == 1:
continue
except KeyError, e:
ret = self.__gen_script_bootconfig(images, flinfo, partition, section)
if ret == 1:
continue
except KeyError as e:
continue
if section_conf == "cdt" or section_conf == "cdt_1" or section_conf == "ddrconfig":