Patchwork [U-Boot,v6,4/5] Build arch/$ARCH/lib/bootm.o depending on CONFIG_CMD_BOOTM

login
register
mail settings
Submitter Dirk Eibach
Date June 12, 2013, 8:08 a.m.
Message ID <1371024486-15629-5-git-send-email-dirk.eibach@gdsys.cc>
Download mbox | patch
Permalink /patch/250701/
State Superseded
Delegated to: Andy Fleming
Headers show

Comments

Dirk Eibach - June 12, 2013, 8:08 a.m.
From: Dirk Eibach <eibach@gdsys.de>

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: Dirk Eibach <dirk.eibach@gdsys.cc>
---
Changes in v6: None
Changes in v5: None
Changes in v4:
- consider CONFIG_CMD_BOOTM for all architectures

Changes in v3: None
Changes in v2: None

 arch/arm/lib/Makefile        | 2 +-
 arch/avr32/lib/Makefile      | 2 +-
 arch/m68k/lib/Makefile       | 2 +-
 arch/microblaze/lib/Makefile | 2 +-
 arch/mips/lib/Makefile       | 4 ++--
 arch/nds32/lib/Makefile      | 3 ++-
 arch/nios2/lib/Makefile      | 2 +-
 arch/openrisc/lib/Makefile   | 2 +-
 arch/powerpc/lib/Makefile    | 2 +-
 arch/sh/lib/Makefile         | 2 +-
 arch/sparc/lib/Makefile      | 3 ++-
 arch/x86/lib/Makefile        | 2 +-
 12 files changed, 15 insertions(+), 13 deletions(-)
Andy Fleming - June 19, 2013, 9:49 p.m.
On Wed, Jun 12, 2013 at 3:08 AM, <dirk.eibach@gdsys.cc> wrote:

> From: Dirk Eibach <eibach@gdsys.de>
>
> 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: Dirk Eibach <dirk.eibach@gdsys.cc>
>

You don't need two sign-offs.

Does anyone have comments on these patches? This one seems reasonable to
me, if a bit scary. Can others test this? Dirk has already tested this on
my systems. I'm not really sure these patches belong in my queue, but I can
apply them if other custodians give their sign-off.

Andy
Dirk Eibach - June 20, 2013, 6:56 a.m.
Hi Andy,

>> From: Dirk Eibach <eibach@gdsys.de>
>>
>> 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: Dirk Eibach <dirk.eibach@gdsys.cc>
>
>
> You don't need two sign-offs.

patman puts and additional SOB to some of my patches. I'm not sure how
to fix this.

Cheers
Dirk
Dirk Eibach - June 20, 2013, 1:06 p.m.
2013/6/20 Dirk Eibach <dirk.eibach@gdsys.cc>:
> Hi Andy,
>
>>> From: Dirk Eibach <eibach@gdsys.de>
>>>
>>> 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: Dirk Eibach <dirk.eibach@gdsys.cc>
>>
>>
>> You don't need two sign-offs.
>
> patman puts and additional SOB to some of my patches. I'm not sure how
> to fix this.

Never mind. I just discovered that SOB line has to be located after
all the other patman stuff in the commit message, then it works as
expected. Will be fixed in v7.

Cheers
Dirk

Patch

diff --git a/arch/arm/lib/Makefile b/arch/arm/lib/Makefile
index 8ad9f66..6526fc8 100644
--- a/arch/arm/lib/Makefile
+++ b/arch/arm/lib/Makefile
@@ -45,8 +45,8 @@  COBJS-y	+= board.o
 endif
 COBJS-y += bss.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 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 f66ad30..ab3ccee 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