firmware-utils: mkfwimage: fix more errors reported by gcc-6/7/9