fix mkfwimage to recognize the -s option