diff --git a/[refs] b/[refs] index 4f02fb21608d..561e11dc71aa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9468613b2bb0a386af563953b613efc6c77bd8c1 +refs/heads/master: 51342d7126342e1f1a40cd96a5798a3cfd6136eb diff --git a/trunk/arch/arm/Makefile b/trunk/arch/arm/Makefile index 2a0b2c8a1fe0..6f4f8bf36071 100644 --- a/trunk/arch/arm/Makefile +++ b/trunk/arch/arm/Makefile @@ -174,11 +174,13 @@ libs-y := arch/arm/lib/ $(libs-y) # Default target when executing plain make ifeq ($(CONFIG_XIP_KERNEL),y) -all: xipImage +KBUILD_IMAGE := xipImage else -all: zImage +KBUILD_IMAGE := zImage endif +all: $(KBUILD_IMAGE) + boot := arch/arm/boot # Update machine arch and proc symlinks if something which affects