| Message ID | 1366963900-2784-7-git-send-email-dirk.eibach@gdsys.cc |
|---|---|
| State | Superseded |
| Headers | show |
Dear Dirk Eibach, In message <1366963900-2784-7-git-send-email-dirk.eibach@gdsys.cc> you wrote: > From: Dirk Eibach <eibach@gdsys.de> > > Signed-off-by: Dirk Eibach <dirk.eibach@gdsys.cc> > > > --- > Changes in v4: > - consider CONFIG_CMD_BOOTM for all architectures On which boards has this been tested? Which of these boards actually do not define CONFIG_CMD_BOOTM? Best regards, Wolfgang Denk
Hello Wolfgang, > In message <1366963900-2784-7-git-send-email-dirk.eibach@gdsys.cc> you > wrote: >> From: Dirk Eibach <eibach@gdsys.de> >> >> Signed-off-by: Dirk Eibach <dirk.eibach@gdsys.cc> >> >> >> --- >> Changes in v4: >> - consider CONFIG_CMD_BOOTM for all architectures > > On which boards has this been tested? MAKEALL was done for ppc4xx and mpc85xx. For anything else I don't have toolchains. Run checks were done on our controlcenterd hardware. > Which of these boards actually do not define CONFIG_CMD_BOOTM? controlcenterd has configruations with and without CONFIG_CMD_BOOTM. Cheers Dirk
diff --git a/arch/arm/lib/Makefile b/arch/arm/lib/Makefile index 6ae161a..68693e4 100644 --- a/arch/arm/lib/Makefile +++ b/arch/arm/lib/Makefile @@ -44,7 +44,7 @@ COBJS-y += board.o endif COBJS-y += bss.o -COBJS-y += bootm.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 ee6d067..fce8af3 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 a8d6cd5..5722b67 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 8d7febd..a40e8d4 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 967e98a..b6ded54 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 581a2e7..705e1ff 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 443f99e..f33f96a 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 db3c657..ab822f4 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 59c723b..8c4920b 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 256811a..3d4eb53 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 7133ef1..aec29b3 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 ee89354..7d67691 100644 --- a/arch/x86/lib/Makefile +++ b/arch/x86/lib/Makefile @@ -29,7 +29,7 @@ ifeq ($(CONFIG_SYS_GENERIC_BOARD),) COBJS-y += board.o endif -COBJS-y += bootm.o +COBJS-$(CONFIG_CMD_BOOTM) += bootm.o COBJS-y += cmd_boot.o COBJS-y += gcc.o COBJS-y += init_helpers.o