g2: cleanup g2.mk

because it's ugly and we're professionals

Change-Id: I7ddabba074a18596928493e9d28a31f22be23593
g2: add extra volume steps

Change-Id: I2e442080841afe0be1dd727adde54eac460a62e7