From e6dbd857474647338c6ef93116ed54575739695e Mon Sep 17 00:00:00 2001 From: speriaka Date: Wed, 4 Sep 2019 16:29:37 +0530 Subject: [PATCH] Revert "tools: pack.py: ipq6018: Add support for NAND AC image" This reverts commit 466666e8d3c8b44165b9c77b7d230c50acbfe1b3. Change-Id: Icb705096f5edec0eefa7a9a68c89600b6b3f9d2d Signed-off-by: speriaka --- tools/pack.py | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/tools/pack.py b/tools/pack.py index 116de339c2..11dae8b551 100644 --- a/tools/pack.py +++ b/tools/pack.py @@ -779,9 +779,9 @@ class Pack(object): section_conf = "lkboot" else: section_conf = "u-boot" - elif section_conf == "rootfs" and self.flash_type in ["nand", "nand-4k", "nand-ac", "nand-audio", "nand-audio-4k", "norplusnand", "norplusnand-4k"]: + elif section_conf == "rootfs" and self.flash_type in ["nand", "nand-4k", "nand-audio", "nand-audio-4k", "norplusnand", "norplusnand-4k"]: section_conf = "ubi" - elif section_conf == "wififw" and self.flash_type in ["nand", "nand-4k", "nand-ac", "nand-audio", "nand-audio-4k", "norplusnand", "norplusnand-4k"]: + elif section_conf == "wififw" and self.flash_type in ["nand", "nand-4k", "nand-audio", "nand-audio-4k", "norplusnand", "norplusnand-4k"]: section_conf = "wififw_ubi" if soc_version: @@ -1103,9 +1103,9 @@ class Pack(object): else: print " Using u-boot..." section_conf = "u-boot" - elif section_conf == "rootfs" and self.flash_type in ["nand", "nand-4k", "nand-ac", "nand-audio", "nand-audio-4k", "norplusnand", "norplusnand-4k"]: + elif section_conf == "rootfs" and self.flash_type in ["nand", "nand-4k", "nand-audio", "nand-audio-4k", "norplusnand", "norplusnand-4k"]: section_conf = "ubi" - elif section_conf == "wififw" and self.flash_type in ["nand", "nand-4k", "nand-ac", "nand-audio", "nand-audio-4k", "norplusnand", "norplusnand-4k"]: + elif section_conf == "wififw" and self.flash_type in ["nand", "nand-4k", "nand-audio", "nand-audio-4k", "norplusnand", "norplusnand-4k"]: section_conf = "wififw_ubi" if soc_version: @@ -1384,8 +1384,6 @@ class Pack(object): flash_param = root.find(".//data[@type='NAND_PARAMETER']/entry[@type='audio-2k']") elif self.flash_type == "nand-audio-4k": flash_param = root.find(".//data[@type='NAND_PARAMETER']/entry[@type='audio-4k']") - elif self.flash_type == "nand-ac": - flash_param = root.find(".//data[@type='NAND_PARAMETER']/entry[@type='ac']") else: flash_param = root.find(".//data[@type='NAND_PARAMETER']/entry[@type='2k']") else: @@ -1469,12 +1467,10 @@ class Pack(object): try: if ftype == "tiny-nor": part_info = root.find(".//data[@type='" + "NOR_PARAMETER']") - elif ftype in ["nand", "nand-4k", "nand-ac", "nand-audio", "nand-audio-4k"]: + elif ftype in ["nand", "nand-4k", "nand-audio", "nand-audio-4k"]: if root.find(".//data[@type='NAND_PARAMETER']/entry") != None: if ftype == "nand": part_info = root.find(".//data[@type='NAND_PARAMETER']/entry[@type='2k']") - elif ftype == "nand-ac": - part_info = root.find(".//data[@type='NAND_PARAMETER']/entry[@type='ac']") elif ftype == "nand-audio": part_info = root.find(".//data[@type='NAND_PARAMETER']/entry[@type='audio-2k']") elif ftype == "nand-audio-4k": @@ -1499,7 +1495,7 @@ class Pack(object): if ftype in ["tiny-nor", "norplusnand", "norplusnand-4k", "norplusemmc"]: ftype = "nor" - if ftype in ["nand-4k", "nand-ac", "nand-audio", "nand-audio-4k"]: + if ftype in ["nand-4k", "nand-audio", "nand-audio-4k"]: ftype = "nand" except ValueError, e: @@ -1516,7 +1512,7 @@ class Pack(object): def __process_board(self, images, root): try: - if self.flash_type in [ "nand", "nand-4k", "nand-ac", "nand-audio", "nand-audio-4k", "nor", "tiny-nor", "norplusnand", "norplusnand-4k" ]: + if self.flash_type in [ "nand", "nand-4k", "nand-audio", "nand-audio-4k", "nor", "tiny-nor", "norplusnand", "norplusnand-4k" ]: ret = self.__process_board_flash(self.flash_type, images, root) elif self.flash_type == "emmc": ret = self.__process_board_flash_emmc(self.flash_type, images, root) @@ -1765,7 +1761,7 @@ def main(): parser.flash_type = parser.flash_type + ",nand-4k" # Add nand-audio flash type, if arch is ipq6018 if ARCH_NAME == "ipq6018": - parser.flash_type = parser.flash_type + ",nand-ac,nand-audio,nand-audio-4k" + parser.flash_type = parser.flash_type + ",nand-audio,nand-audio-4k" # Add norplusnand-4k flash type, if norplusnand flash type is specified if "norplusnand" in parser.flash_type.split(","):