Add options parameter to function FlashDevice2 and remove unused function FlashDevice. Flash options are now visible at the top of the function tree instead of being buried inside function FlashDevice2.
Ensure that softloader can be flashed prior to, but along with either PIB and firmware or just PIB.
Merge remote-tracking branch 'upstream/master'