begonia: releasetools: Yeet firmware from builds

Author: SahilSonar

potato.dependencies

@@ -7,9 +7,5 @@
   {
     "repository" : "vendor_redmi_begonia",
     "target_path": "vendor/redmi/begonia"
-  },
-  {
-    "repository" : "vendor_redmi_begonia-firmware",
-    "target_path": "vendor/redmi/begonia-firmware"
   }
 ]

releasetools.py

@@ -23,86 +23,17 @@ def FullOTA_InstallEnd(info):
 def IncrementalOTA_InstallEnd(info):
   OTA_InstallEnd(info, True)
 
-def AddImageOnly(info, basename, incremental, firmware):
+def AddImage(info, basename, dest, incremental):
+  name = basename
   if incremental:
     input_zip = info.source_zip
   else:
     input_zip = info.input_zip
-  if firmware:
-    data = input_zip.read("RADIO/" + basename)
-  else:
-    data = input_zip.read("IMAGES/" + basename)
-  common.ZipWriteStr(info.output_zip, basename, data)
-
-def AddImage(info, basename, dest, incremental):
-  AddImageOnly(info, basename, incremental, False)
-  info.script.AppendExtra('package_extract_file("%s", "%s");' % (basename, dest))
+  data = input_zip.read("IMAGES/" + basename)
+  common.ZipWriteStr(info.output_zip, name, data)
+  info.script.AppendExtra('package_extract_file("%s", "%s");' % (name, dest))
 
 def OTA_InstallEnd(info, incremental):
   info.script.Print("Patching vbmeta and dtbo images...")
   AddImage(info, "vbmeta.img", "/dev/block/by-name/vbmeta", incremental)
   AddImage(info, "dtbo.img", "/dev/block/by-name/dtbo", incremental)
-  Firmware_Images(info, incremental)
-
-def Firmware_Images(info, incremental):
-  bin_map = {
-      'logo': ['logo']
-      }
-
-  img_map = {
-      'audio_dsp': ['audio_dsp'],
-      'cam_vpu1': ['cam_vpu1'],
-      'cam_vpu2': ['cam_vpu2'],
-      'cam_vpu3': ['cam_vpu3'],
-      'gz': ['gz1', 'gz2'],
-      'lk': ['lk', 'lk2'],
-      'md1img': ['md1img'],
-      'scp': ['scp1', 'scp2'],
-      'spmfw': ['spmfw'],
-      'sspm': ['sspm_1', 'sspm_2'],
-      'tee': ['tee1', 'tee2']
-      }
-
-  pl = 'preloader_ufs'
-  pl_part = ['sda', 'sdb']
-
-  fw_cmd = 'ifelse(getprop("ro.boot.hwc") == "India",\n(\n'
-  fw_cmd += 'ui_print("Flashing begoniain (Indian) firmware...");\n'
-
-  # Flash Indian Firmware
-  AddImageOnly(info, "{}_in.img".format(pl), incremental, True)
-  for part in pl_part:
-      fw_cmd += 'package_extract_file("{}_in.img", "/dev/block/{}");\n'.format(pl, part)
-
-  for img in img_map.keys():
-    AddImageOnly(info, '{}_in.img'.format(img), incremental, True)
-    for part in img_map[img]:
-      fw_cmd += 'package_extract_file("{}_in.img", "/dev/block/bootdevice/by-name/{}");\n'.format(img, part)
-
-  for _bin in bin_map.keys():
-    AddImageOnly(info, '{}_in.bin'.format(_bin), incremental, True)
-    for part in bin_map[_bin]:
-      fw_cmd += 'package_extract_file("{}_in.bin", "/dev/block/bootdevice/by-name/{}");\n'.format(_bin, part)
-  # END Flash Indian Firmware
-
-  fw_cmd += '),\n(\n'
-  fw_cmd += 'ui_print("Flashing begonia (Global) firmware...");\n'
-
-  # Flash Global Firmware
-  AddImageOnly(info, "{}.img".format(pl), incremental, True)
-  for part in pl_part:
-      fw_cmd += 'package_extract_file("{}.img", "/dev/block/{}");\n'.format(pl, part)
-
-  for img in img_map.keys():
-    AddImageOnly(info, '{}.img'.format(img), incremental, True)
-    for part in img_map[img]:
-      fw_cmd += 'package_extract_file("{}.img", "/dev/block/bootdevice/by-name/{}");\n'.format(img, part)
-
-  for _bin in bin_map.keys():
-    AddImageOnly(info, '{}.bin'.format(_bin), incremental, True)
-    for part in bin_map[_bin]:
-      fw_cmd += 'package_extract_file("{}.bin", "/dev/block/bootdevice/by-name/{}");\n'.format(_bin, part)
-  # END Flash Global Firmware
-
-  fw_cmd += ')\n);'
-  info.script.AppendExtra(fw_cmd)