From f183b36c08c0f515dd2b59197474af8bffe8337f Mon Sep 17 00:00:00 2001 From: Ameya Thakur Date: Tue, 1 Jul 2014 12:05:45 -0700 Subject: [PATCH] common: releasetools: Do not distinguish between nand and emmc devices Code cleanup. We no longer support nand based devices on mainline. Change-Id: Ie2291f82fc6b0fc1972fccd825ce9b1686d1d3cb --- releasetools.py | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/releasetools.py b/releasetools.py index 4c7373c2..4e02144c 100755 --- a/releasetools.py +++ b/releasetools.py @@ -226,9 +226,8 @@ def IncrementalOTA_Assertions(info): def IncrementalOTA_VerifyEnd(info): - if info.type == 'MMC': - OTA_VerifyEnd(info, info.target_version, info.target_zip, info.source_zip) - return + OTA_VerifyEnd(info, info.target_version, info.target_zip, info.source_zip) + return # This function handles only non-HLOS whole partition images @@ -346,13 +345,9 @@ def FullOTA_InstallEnd_MTD(info): def FullOTA_InstallEnd(info): - if info.type == 'MMC': - FullOTA_InstallEnd_MMC(info) - elif info.type == 'MTD': - FullOTA_InstallEnd_MTD(info) + FullOTA_InstallEnd_MMC(info) return - def IncrementalOTA_InstallEnd_MMC(info): OTA_InstallEnd(info) return @@ -362,10 +357,6 @@ def IncrementalOTA_InstallEnd_MTD(info): print "warning radio-update: radio update for NAND devices not supported" return - def IncrementalOTA_InstallEnd(info): - if info.type == 'MMC': - IncrementalOTA_InstallEnd_MMC(info) - elif info.type == 'MTD': - IncrementalOTA_InstallEnd_MTD(info) + IncrementalOTA_InstallEnd_MMC(info) return