i.MX consolidation patches

[Russell King - ARM Linux]

On Wed, Jun 01, 2011 at 04:18:47PM +0200, Sascha Hauer wrote:
> diff --git a/arch/arm/boot/Makefile b/arch/arm/boot/Makefile
> index 9128fdd..e3b6f02 100644
> --- a/arch/arm/boot/Makefile
> +++ b/arch/arm/boot/Makefile
> @@ -59,6 +59,11 @@ $(obj)/zImage:	$(obj)/compressed/vmlinux FORCE
>  
>  endif
>  
> +ifeq ($(CONFIG_ARM_PATCH_PHYS_VIRT),y)
> +$(obj)/uImage: $(obj)/zImage FORCE
> +	@echo 'building uImages is incompatible with CONFIG_ARM_PATCH_PHYS_VIRT'
> +	@false

It may be better to drop the zImage dependency too, so that folk don't get
the message at the end of an otherwise successful kernel build - they may
decide to turn p2v patching off which would result in a rebuild.

Or it could suggest the mkimage command which should be run, but with
<LOAD-ADDRESS> inserted into it at the appropriate point - iow something
like:

  mkimage -A arm -O linux -T kernel -C none \
	-a <LOAD-ADDRESS> -e <START-ADDRESS> \
	-n 'Linux-$(KERNELRELEASE)' -d arch/arm/boot/zImage uImage.<PLATFORM>