Makefile changes

Conflicts:
	arch/arm/boot/zImage
more makefile tweaks

Conflicts:
	arch/arm/boot/zImage