[U-Boot] [PATCH 1/2 v2] build: add missing $(AR)->$(cmd_link_o_target) update

Simon Glass sjg at chromium.org
Tue Oct 18 22:49:20 CEST 2011


On Tue, Oct 18, 2011 at 8:30 AM, Mike Frysinger <vapier at gentoo.org> wrote:
> Seems people fixed their files to use libfoo.o, but didn't actually
> update the creation targets to use $(cmd_link_o_target).  Update the
> rest of the Makefile's found with grep.
>
> Signed-off-by: Mike Frysinger <vapier at gentoo.org>
> ---
> v2
>        - fixup new sandbox makefile too
>
>  arch/arm/cpu/arm926ejs/armada100/Makefile |    2 +-
>  arch/arm/cpu/arm926ejs/pantheon/Makefile  |    2 +-
>  arch/arm/cpu/armv7/tegra2/Makefile        |    2 +-
>  board/Marvell/aspenite/Makefile           |    2 +-
>  board/Marvell/dkb/Makefile                |    2 +-
>  board/Marvell/gplugd/Makefile             |    2 +-
>  board/cm_t35/Makefile                     |    2 +-
>  board/davinci/ea20/Makefile               |    2 +-
>  board/freescale/p1023rds/Makefile         |    2 +-
>  board/matrix_vision/mergerbox/Makefile    |    2 +-
>  board/nvidia/harmony/Makefile             |    2 +-
>  board/nvidia/seaboard/Makefile            |    2 +-
>  board/samsung/origen/Makefile             |    2 +-
>  board/samsung/smdkv310/Makefile           |    2 +-
>  board/sandbox/sandbox/Makefile            |    2 +-
>  board/shmin/Makefile                      |    2 +-
>  16 files changed, 16 insertions(+), 16 deletions(-)

I tested harmony, seaboard (which include tegra2) and sandbox, and
looked at all the others.

Tested-by: Simon Glass <sjg at chromium.org>

>
> diff --git a/arch/arm/cpu/arm926ejs/armada100/Makefile b/arch/arm/cpu/arm926ejs/armada100/Makefile
> index 76bd06d..d30d608 100644
> --- a/arch/arm/cpu/arm926ejs/armada100/Makefile
> +++ b/arch/arm/cpu/arm926ejs/armada100/Makefile
> @@ -34,7 +34,7 @@ OBJS  := $(addprefix $(obj),$(SOBJS) $(COBJS-y))
>  all:   $(obj).depend $(LIB)
>
>  $(LIB):        $(OBJS)
> -       $(AR) $(ARFLAGS) $@ $(OBJS)
> +       $(call cmd_link_o_target, $(OBJS))
>
>  #########################################################################
>
> diff --git a/arch/arm/cpu/arm926ejs/pantheon/Makefile b/arch/arm/cpu/arm926ejs/pantheon/Makefile
> index ab94985..8f962b0 100644
> --- a/arch/arm/cpu/arm926ejs/pantheon/Makefile
> +++ b/arch/arm/cpu/arm926ejs/pantheon/Makefile
> @@ -34,7 +34,7 @@ OBJS  := $(addprefix $(obj),$(SOBJS) $(COBJS-y))
>  all:   $(obj).depend $(LIB)
>
>  $(LIB):        $(OBJS)
> -       $(AR) $(ARFLAGS) $@ $(OBJS)
> +       $(call cmd_link_o_target, $(OBJS))
>
>  #########################################################################
>
> diff --git a/arch/arm/cpu/armv7/tegra2/Makefile b/arch/arm/cpu/armv7/tegra2/Makefile
> index f673f03..f0dc2ff 100644
> --- a/arch/arm/cpu/armv7/tegra2/Makefile
> +++ b/arch/arm/cpu/armv7/tegra2/Makefile
> @@ -36,7 +36,7 @@ OBJS  := $(addprefix $(obj),$(COBJS) $(SOBJS))
>  all:    $(obj).depend $(LIB)
>
>  $(LIB):        $(OBJS)
> -       $(AR) $(ARFLAGS) $@ $(OBJS)
> +       $(call cmd_link_o_target, $(OBJS))
>
>  #########################################################################
>
> diff --git a/board/Marvell/aspenite/Makefile b/board/Marvell/aspenite/Makefile
> index 4a807be..6d771ed 100644
> --- a/board/Marvell/aspenite/Makefile
> +++ b/board/Marvell/aspenite/Makefile
> @@ -34,7 +34,7 @@ OBJS  := $(addprefix $(obj),$(COBJS))
>  SOBJS  := $(addprefix $(obj),$(SOBJS))
>
>  $(LIB):        $(obj).depend $(OBJS) $(SOBJS)
> -       $(AR) $(ARFLAGS) $@ $(OBJS) $(SOBJS)
> +       $(call cmd_link_o_target, $(OBJS) $(SOBJS))
>
>  #########################################################################
>
> diff --git a/board/Marvell/dkb/Makefile b/board/Marvell/dkb/Makefile
> index ddb799d..754c889 100644
> --- a/board/Marvell/dkb/Makefile
> +++ b/board/Marvell/dkb/Makefile
> @@ -33,7 +33,7 @@ OBJS  := $(addprefix $(obj),$(COBJS))
>  SOBJS  := $(addprefix $(obj),$(SOBJS))
>
>  $(LIB):        $(obj).depend $(OBJS) $(SOBJS)
> -       $(AR) $(ARFLAGS) $@ $(OBJS) $(SOBJS)
> +       $(call cmd_link_o_target, $(OBJS) $(SOBJS))
>
>  #########################################################################
>
> diff --git a/board/Marvell/gplugd/Makefile b/board/Marvell/gplugd/Makefile
> index 3ce4f81..40188c6 100644
> --- a/board/Marvell/gplugd/Makefile
> +++ b/board/Marvell/gplugd/Makefile
> @@ -39,7 +39,7 @@ OBJS  := $(addprefix $(obj),$(COBJS))
>  SOBJS  := $(addprefix $(obj),$(SOBJS))
>
>  $(LIB):        $(obj).depend $(OBJS) $(SOBJS)
> -       $(AR) $(ARFLAGS) $@ $(OBJS) $(SOBJS)
> +       $(call cmd_link_o_target, $(OBJS) $(SOBJS))
>
>  #########################################################################
>
> diff --git a/board/cm_t35/Makefile b/board/cm_t35/Makefile
> index d08c024..27693f0 100644
> --- a/board/cm_t35/Makefile
> +++ b/board/cm_t35/Makefile
> @@ -31,7 +31,7 @@ SRCS  := $(COBJS:.o=.c)
>  OBJS   := $(addprefix $(obj),$(COBJS))
>
>  $(LIB):        $(obj).depend $(OBJS)
> -       $(AR) $(ARFLAGS) $@ $(OBJS)
> +       $(call cmd_link_o_target, $(OBJS))
>
>  #########################################################################
>
> diff --git a/board/davinci/ea20/Makefile b/board/davinci/ea20/Makefile
> index 1725f2b..265f8b2 100644
> --- a/board/davinci/ea20/Makefile
> +++ b/board/davinci/ea20/Makefile
> @@ -36,7 +36,7 @@ OBJS  := $(addprefix $(obj),$(COBJS))
>  SOBJS  := $(addprefix $(obj),$(SOBJS))
>
>  $(LIB):        $(obj).depend $(OBJS) $(SOBJS)
> -       $(AR) $(ARFLAGS) $@ $(OBJS) $(SOBJS)
> +       $(call cmd_link_o_target, $(OBJS) $(SOBJS))
>
>  #########################################################################
>  # This is for $(obj).depend target
> diff --git a/board/freescale/p1023rds/Makefile b/board/freescale/p1023rds/Makefile
> index f62583c..08d6d66 100644
> --- a/board/freescale/p1023rds/Makefile
> +++ b/board/freescale/p1023rds/Makefile
> @@ -20,7 +20,7 @@ OBJS  := $(addprefix $(obj),$(COBJS-y))
>  SOBJS  := $(addprefix $(obj),$(SOBJS))
>
>  $(LIB):        $(obj).depend $(OBJS) $(SOBJS)
> -       $(AR) $(ARFLAGS) $@ $(OBJS)
> +       $(call cmd_link_o_target, $(OBJS))
>
>  #########################################################################
>
> diff --git a/board/matrix_vision/mergerbox/Makefile b/board/matrix_vision/mergerbox/Makefile
> index 9cd2f1a..3836b1b 100644
> --- a/board/matrix_vision/mergerbox/Makefile
> +++ b/board/matrix_vision/mergerbox/Makefile
> @@ -33,7 +33,7 @@ OBJS  := $(addprefix $(obj),$(COBJS))
>  SOBJS  := $(addprefix $(obj),$(SOBJS))
>
>  $(LIB):        $(obj).depend $(OBJS)
> -       $(AR) $(ARFLAGS) $@ $(OBJS)
> +       $(call cmd_link_o_target, $(OBJS))
>
>  #########################################################################
>
> diff --git a/board/nvidia/harmony/Makefile b/board/nvidia/harmony/Makefile
> index 0319166..f6599de 100644
> --- a/board/nvidia/harmony/Makefile
> +++ b/board/nvidia/harmony/Makefile
> @@ -37,7 +37,7 @@ SRCS  := $(COBJS:.o=.c)
>  OBJS   := $(addprefix $(obj),$(COBJS))
>
>  $(LIB):        $(obj).depend $(OBJS)
> -       $(AR) $(ARFLAGS) $@ $(OBJS)
> +       $(call cmd_link_o_target, $(OBJS))
>
>  #########################################################################
>
> diff --git a/board/nvidia/seaboard/Makefile b/board/nvidia/seaboard/Makefile
> index 0319166..f6599de 100644
> --- a/board/nvidia/seaboard/Makefile
> +++ b/board/nvidia/seaboard/Makefile
> @@ -37,7 +37,7 @@ SRCS  := $(COBJS:.o=.c)
>  OBJS   := $(addprefix $(obj),$(COBJS))
>
>  $(LIB):        $(obj).depend $(OBJS)
> -       $(AR) $(ARFLAGS) $@ $(OBJS)
> +       $(call cmd_link_o_target, $(OBJS))
>
>  #########################################################################
>
> diff --git a/board/samsung/origen/Makefile b/board/samsung/origen/Makefile
> index f5c6507..bb6eaf6 100644
> --- a/board/samsung/origen/Makefile
> +++ b/board/samsung/origen/Makefile
> @@ -47,7 +47,7 @@ endif
>  all:   $(ALL)
>
>  $(LIB):        $(OBJS)
> -       $(AR) $(ARFLAGS) $@ $(OBJS)
> +       $(call cmd_link_o_target, $(OBJS))
>
>  ifdef CONFIG_SPL_BUILD
>  tools/mk$(BOARD)spl.exe:       tools/mkv310_image.c
> diff --git a/board/samsung/smdkv310/Makefile b/board/samsung/smdkv310/Makefile
> index 8e9b703..d168abd 100644
> --- a/board/samsung/smdkv310/Makefile
> +++ b/board/samsung/smdkv310/Makefile
> @@ -34,7 +34,7 @@ OBJS  := $(addprefix $(obj),$(COBJS) $(SOBJS))
>  all:    $(obj).depend $(LIB)
>
>  $(LIB):        $(OBJS)
> -       $(AR) $(ARFLAGS) $@ $(OBJS)
> +       $(call cmd_link_o_target, $(OBJS))
>
>  #########################################################################
>
> diff --git a/board/sandbox/sandbox/Makefile b/board/sandbox/sandbox/Makefile
> index 6366a07..0de4497 100644
> --- a/board/sandbox/sandbox/Makefile
> +++ b/board/sandbox/sandbox/Makefile
> @@ -30,7 +30,7 @@ SRCS  := $(COBJS:.o=.c)
>  OBJS   := $(addprefix $(obj),$(COBJS))
>
>  $(LIB):        $(obj).depend $(OBJS)
> -       $(AR) $(ARFLAGS) $@ $(OBJS)
> +       $(call cmd_link_o_target, $(OBJS))
>
>  #########################################################################
>
> diff --git a/board/shmin/Makefile b/board/shmin/Makefile
> index 33fd9c7..666b33c 100644
> --- a/board/shmin/Makefile
> +++ b/board/shmin/Makefile
> @@ -31,7 +31,7 @@ OBJS  := $(addprefix $(obj),$(OBJS))
>  SOBJS  := $(addprefix $(obj),$(SOBJS))
>
>  $(LIB):        $(obj).depend $(OBJS) $(SOBJS)
> -       $(AR) $(ARFLAGS) $@ $(OBJS) $(SOBJS)
> +       $(call cmd_link_o_target, $(OBJS) $(SOBJS))
>
>  #########################################################################
>
> --
> 1.7.6.1
>
> _______________________________________________
> U-Boot mailing list
> U-Boot at lists.denx.de
> http://lists.denx.de/mailman/listinfo/u-boot
>


More information about the U-Boot mailing list