summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--arch/arm/lib/Makefile2
-rw-r--r--arch/avr32/lib/Makefile2
-rw-r--r--arch/m68k/lib/Makefile2
-rw-r--r--arch/microblaze/lib/Makefile2
-rw-r--r--arch/mips/lib/Makefile4
-rw-r--r--arch/nds32/lib/Makefile3
-rw-r--r--arch/nios2/lib/Makefile2
-rw-r--r--arch/openrisc/lib/Makefile2
-rw-r--r--arch/powerpc/lib/Makefile2
-rw-r--r--arch/sh/lib/Makefile2
-rw-r--r--arch/sparc/lib/Makefile3
-rw-r--r--arch/x86/lib/Makefile2
12 files changed, 15 insertions, 13 deletions
diff --git a/arch/arm/lib/Makefile b/arch/arm/lib/Makefile
index 9ecafb2723f..a1ac375373d 100644
--- a/arch/arm/lib/Makefile
+++ b/arch/arm/lib/Makefile
@@ -45,8 +45,8 @@ COBJS-y += board.o
endif
COBJS-y += sections.o
-COBJS-y += bootm.o
COBJS-$(CONFIG_OF_LIBFDT) += bootm-fdt.o
+COBJS-$(CONFIG_CMD_BOOTM) += bootm.o
COBJS-$(CONFIG_SYS_L2_PL310) += cache-pl310.o
SOBJS-$(CONFIG_USE_ARCH_MEMSET) += memset.o
SOBJS-$(CONFIG_USE_ARCH_MEMCPY) += memcpy.o
diff --git a/arch/avr32/lib/Makefile b/arch/avr32/lib/Makefile
index ee6d0672aa6..fce8af3f294 100644
--- a/arch/avr32/lib/Makefile
+++ b/arch/avr32/lib/Makefile
@@ -30,7 +30,7 @@ LIB = $(obj)lib$(ARCH).o
SOBJS-y += memset.o
COBJS-y += board.o
-COBJS-y += bootm.o
+COBJS-$(CONFIG_CMD_BOOTM) += bootm.o
COBJS-y += interrupts.o
SRCS := $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c)
diff --git a/arch/m68k/lib/Makefile b/arch/m68k/lib/Makefile
index a8d6cd54d80..5722b6782f1 100644
--- a/arch/m68k/lib/Makefile
+++ b/arch/m68k/lib/Makefile
@@ -28,7 +28,7 @@ LIB = $(obj)lib$(ARCH).o
SOBJS-y +=
COBJS-y += board.o
-COBJS-y += bootm.o
+COBJS-$(CONFIG_CMD_BOOTM) += bootm.o
COBJS-y += cache.o
COBJS-y += interrupts.o
COBJS-y += time.o
diff --git a/arch/microblaze/lib/Makefile b/arch/microblaze/lib/Makefile
index 8d7febd4782..a40e8d47a55 100644
--- a/arch/microblaze/lib/Makefile
+++ b/arch/microblaze/lib/Makefile
@@ -28,7 +28,7 @@ LIB = $(obj)lib$(ARCH).o
SOBJS-y +=
COBJS-y += board.o
-COBJS-y += bootm.o
+COBJS-$(CONFIG_CMD_BOOTM) += bootm.o
COBJS-y += muldi3.o
SRCS := $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c)
diff --git a/arch/mips/lib/Makefile b/arch/mips/lib/Makefile
index 967e98a5261..b6ded547164 100644
--- a/arch/mips/lib/Makefile
+++ b/arch/mips/lib/Makefile
@@ -36,9 +36,9 @@ SOBJS-y +=
COBJS-y += board.o
ifeq ($(CONFIG_QEMU_MIPS),y)
-COBJS-y += bootm_qemu_mips.o
+COBJS-$(CONFIG_CMD_BOOTM) += bootm_qemu_mips.o
else
-COBJS-y += bootm.o
+COBJS-$(CONFIG_CMD_BOOTM) += bootm.o
endif
SRCS := $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c)
diff --git a/arch/nds32/lib/Makefile b/arch/nds32/lib/Makefile
index 581a2e758af..705e1ff90dd 100644
--- a/arch/nds32/lib/Makefile
+++ b/arch/nds32/lib/Makefile
@@ -29,7 +29,8 @@ include $(TOPDIR)/config.mk
LIB = $(obj)lib$(ARCH).o
-OBJS := board.o bootm.o cache.o interrupts.o
+OBJS := board.o cache.o interrupts.o
+COBJS-$(CONFIG_CMD_BOOTM) += bootm.o
all: $(LIB)
diff --git a/arch/nios2/lib/Makefile b/arch/nios2/lib/Makefile
index 443f99ee158..f33f96a51ad 100644
--- a/arch/nios2/lib/Makefile
+++ b/arch/nios2/lib/Makefile
@@ -28,7 +28,7 @@ LIB = $(obj)lib$(ARCH).o
SOBJS-y += cache.o
COBJS-y += board.o
-COBJS-y += bootm.o
+COBJS-$(CONFIG_CMD_BOOTM) += bootm.o
COBJS-y += libgcc.o
COBJS-y += time.o
diff --git a/arch/openrisc/lib/Makefile b/arch/openrisc/lib/Makefile
index db3c6570704..ab822f4f99d 100644
--- a/arch/openrisc/lib/Makefile
+++ b/arch/openrisc/lib/Makefile
@@ -28,7 +28,7 @@ LIB = $(obj)lib$(ARCH).o
SOBJS-y +=
COBJS-y += board.o
-COBJS-y += bootm.o
+COBJS-$(CONFIG_CMD_BOOTM) += bootm.o
COBJS-y += timer.o
SRCS := $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c)
diff --git a/arch/powerpc/lib/Makefile b/arch/powerpc/lib/Makefile
index 59c723b0709..8c4920b7b42 100644
--- a/arch/powerpc/lib/Makefile
+++ b/arch/powerpc/lib/Makefile
@@ -63,7 +63,7 @@ ifndef CONFIG_SYS_GENERIC_BOARD
COBJS-y += board.o
endif
endif
-COBJS-y += bootm.o
+COBJS-$(CONFIG_CMD_BOOTM) += bootm.o
COBJS-y += cache.o
COBJS-y += extable.o
COBJS-y += interrupts.o
diff --git a/arch/sh/lib/Makefile b/arch/sh/lib/Makefile
index 256811afd4b..3d4eb53a0bc 100644
--- a/arch/sh/lib/Makefile
+++ b/arch/sh/lib/Makefile
@@ -33,7 +33,7 @@ GLSOBJS += lshrdi3.o
GLSOBJS += movmem.o
COBJS-y += board.o
-COBJS-y += bootm.o
+COBJS-$(CONFIG_CMD_BOOTM) += bootm.o
ifeq ($(CONFIG_SH2),y)
COBJS-y += time_sh2.o
else
diff --git a/arch/sparc/lib/Makefile b/arch/sparc/lib/Makefile
index 7133ef1015d..aec29b3710e 100644
--- a/arch/sparc/lib/Makefile
+++ b/arch/sparc/lib/Makefile
@@ -27,7 +27,8 @@ LIB = $(obj)lib$(ARCH).o
SOBJS =
-COBJS = board.o cache.o interrupts.o time.o bootm.o
+COBJS = board.o cache.o interrupts.o time.o
+COBJS-$(CONFIG_CMD_BOOTM) += bootm.o
SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS))
diff --git a/arch/x86/lib/Makefile b/arch/x86/lib/Makefile
index f66ad30741e..ab3ccee47f6 100644
--- a/arch/x86/lib/Makefile
+++ b/arch/x86/lib/Makefile
@@ -25,7 +25,7 @@ include $(TOPDIR)/config.mk
LIB = $(obj)lib$(ARCH).o
-COBJS-y += bootm.o
+COBJS-$(CONFIG_CMD_BOOTM) += bootm.o
COBJS-y += cmd_boot.o
COBJS-y += gcc.o
COBJS-y += init_helpers.o