the "bl2" partition's name has been renamed/uppercase to "BL2" git link
the size of ubi partition is increased so I changed the "0x4000000" to "0x20000000" git link
Thats all I changed and just called the make command and it generated the "proper" flash image.
Please note after the ubi size change I get the below entry in the boot log (just like in the original): "mtd: partition "ubi" extends beyond the end of device "nmbm_spim_nand" -- size truncated to 0x7280000"
so probalby the "0x20000000" value is too much but that is in the orginal image as well and as it solves itself automatically I can live with that
Thanks for your update. Though one of my router worked (UART or Uboot menu) my second router is still not upgradable. It turns out that it has a different original firmware. UART menu does not have the same options as the newer version of the router. Can't get to U-boot menu from reboot+reset button too!! I tried to use the sysupgrade image @sese shared on the original router's luci upgrade page, but always getting 'Incorrect file type' error!!! I tried the official images from OpenWrt release too.