New makefile rules for combined bootloader/firmware uploads
Added blocking delay function