Spirit stuff

Change-Id: I266af351e670986f996356dc39c195f13020445c

Conflicts:
	config/common.mk