Build arch/$ARCH/lib/bootm.o depending on CONFIG_CMD_BOOTM

MAKEALL is fine for ppc4xx and mpc85xx.
Run checks were done on our controlcenterd hardware.

Signed-off-by: Dirk Eibach <dirk.eibach@gdsys.cc>
Signed-off-by: Andy Fleming <afleming@freescale.com>

diff --git a/arch/arm/lib/Makefile b/arch/arm/lib/Makefile
index 9ecafb2723f8ce8c22b45dc9348c2aace9a3331b..a1ac375373dbcc0318a906dab10c3b89e1769af2 100644 (file)
--- 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 ee6d0672aa6f44dec64d47ff1952baca60abdbf6..fce8af3f294c50de480989f2193c3cb40e95100a 100644 (file)
--- 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 a8d6cd54d808bbad49561d796217bb22dad24faa..5722b6782f10552ff5f176e9aaf92e6f2c0c9801 100644 (file)
--- 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 8d7febd47826a3ff3b78f9e00f8170e77ec87e12..a40e8d47a55584297cb8686ce2037ce38cfe70f0 100644 (file)
--- 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 967e98a52614ff7be05b52e7a8600e6698d5541d..b6ded547164d1e08534d4ce613d79d3f355dfa97 100644 (file)
--- 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 581a2e758afae4da53786920dfa8c8afd6f87bb4..705e1ff90dd66c4f6e39178e12e6f32e5a2086b5 100644 (file)
--- 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 443f99ee158174c10e9672037aa549b9a424c9c4..f33f96a51ad4f74a0a20b8b2267b6b16a481194d 100644 (file)
--- 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 db3c657070427b9357c58b7ed311498ae0075638..ab822f4f99d3808a576e2c97c12b6f549ce3c1cc 100644 (file)
--- 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 59c723b07091d0c8b111c217ef92b7034c32e9d9..8c4920b7b424c7855356ae43e7276cf959efad2e 100644 (file)
--- 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 256811afd4b7fa2ff329b7866068cd84202ce5a8..3d4eb53a0bcb4c02a246e1cadb4f2a36846f6458 100644 (file)
--- 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 7133ef1015d39a1b131335a372b7ab23fa472466..aec29b3710e68471aff63de09427e8ed32067a8c 100644 (file)
--- 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 f66ad30741e597ec67e88b5f95ddd5ca2fb4e919..ab3ccee47f662237de6642216788743b486ef0d3 100644 (file)
--- 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