target/x86: rearrange image Makefile, indent, reorder, simplify, change some ifeq...