diff --git a/[refs] b/[refs] index d11d6801b35e..8f6ab54a6d25 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ac5bbf21bf38b3f5eaa8cb1e17f7513dc354afda +refs/heads/master: a4f14bace8ddf0cc26fc2d658b6dd37c71178770 diff --git a/trunk/arch/arm/Makefile b/trunk/arch/arm/Makefile index 7b8ff66febe1..1a4649667ec8 100644 --- a/trunk/arch/arm/Makefile +++ b/trunk/arch/arm/Makefile @@ -251,6 +251,7 @@ define archhelp echo '* zImage - Compressed kernel image (arch/$(ARCH)/boot/zImage)' echo ' Image - Uncompressed kernel image (arch/$(ARCH)/boot/Image)' echo '* xipImage - XIP kernel image, if configured (arch/$(ARCH)/boot/xipImage)' + echo ' uImage - U-Boot wrapped zImage' echo ' bootpImage - Combined zImage and initial RAM disk' echo ' (supply initrd image via make variable INITRD=)' echo ' install - Install uncompressed kernel'