cleanup image types and add console back in on g2c

Signed-off-by: Stephano Cetola <scetola@reachtech.com>
remove unneeded include and add console back in

Signed-off-by: Stephano Cetola <scetola@reachtech.com>