downloadfiles: update for nand with pre-downloaded files

Author: frank-w

downloadfiles.py

@@ -50,7 +50,7 @@ def download(url, file_name=None):
     else:
         return response.content
 
-boardpattern='^(bpi-r[2346]+(pro|mini)?).*$'
+boardpattern='^(bpi-r[2346]+(pro|mini|lite)?).*$'
 
 def getUbootInfo():
     uboot_release_url="https://api.github.com/repos/frank-w/u-boot/releases/latest"
@@ -218,7 +218,9 @@ def getInitrdInfo():
 newconfig={}
 if config and config.get("skipubootdownload"):
     newconfig["skipubootdownload"]=config.get("skipubootdownload")
-    newconfig["imgfile"]=config.get("imgfile")
+    newconfig["imgfile"]=config.get("imgfile","")
+    newconfig["bl2file"]=config.get("bl2file","")
+    newconfig["fipfile"]=config.get("fipfile","")
 elif ufile and "mmc" in device:
     fname=ufile.get("name")
     a = urlparse(ufile.get("url"))
@@ -231,9 +233,7 @@ def getInitrdInfo():
     if c=='y':
         download(ufile.get("url"),fname)
     newconfig["imgfile"]=fname
-else: print("no uboot image defined!")
-
-if ufile and device in ['spim-nand','nor']:
+elif ufile and device in ['spim-nand','nor']:
     bl2=ufile.get("bl2")
     fip=ufile.get("fip")
     if bl2:
@@ -242,6 +242,7 @@ def getInitrdInfo():
     if fip:
         download(fip.get("url"),fip.get("name"))
         newconfig["fipfile"]=fip.get("name")
+else: print("no uboot image defined!")
 
 if config and config.get("skipkerneldownload"):
     newconfig["skipkerneldownload"]=config.get("skipkerneldownload")
@@ -272,7 +273,10 @@ def getInitrdInfo():
             newconfig[replacement+"file"]=fname
         else: print("no bfiles defined!")
 
-if device in ["spim-nand","nor"]:
+if config and config.get("skipinitrddownload"):
+    newconfig["skipinitrddownload"]=config.get("skipinitrddownload")
+    newconfig["initrd"]=config.get("initrd","")
+elif device in ["spim-nand","nor"]:
     if ifiles:
         fname="rootfs_arm64.cpio.zst"
         if fname in ifiles: