Merge "ipq807x: Add support for fail-safe boot on WIFI FW partition."

This commit is contained in:
Linux Build Service Account 2018-01-09 03:18:21 -08:00 committed by Gerrit - the friendly Code Review server
commit 41d043fcf2

View file

@ -880,6 +880,8 @@ class Pack(object):
section_conf = "u-boot"
elif section_conf == "rootfs" and (self.flash_type == "nand" or self.flash_type == "norplusnand"):
section_conf = "ubi"
elif section_conf == "wififw" and (self.flash_type == "nand" or self.flash_type == "norplusnand"):
section_conf = "wififw_ubi"
script.start_activity("Flashing %s:" % section_conf)
@ -1107,6 +1109,8 @@ class Pack(object):
section_conf = "u-boot"
elif section_conf == "rootfs" and (self.flash_type == "nand" or self.flash_type == "norplusnand"):
section_conf = "ubi"
elif section_conf == "wififw" and (self.flash_type == "nand" or self.flash_type == "norplusnand"):
section_conf = "wififw_ubi"
image_info = ImageInfo(section_conf + "-" + sha1(filename),
filename, "firmware")
if filename.lower() != "none":