Patchwork [U-Boot,v2,17/19] sandbox: convert makefiles to Kbuild style

login
register
mail settings
Submitter Masahiro Yamada
Date Sept. 26, 2013, 11:51 a.m.
Message ID <1380196286-10810-18-git-send-email-yamada.m@jp.panasonic.com>
Download mbox | patch
Permalink /patch/278176/
State Superseded
Delegated to: Tom Rini
Headers show

Comments

Masahiro Yamada - Sept. 26, 2013, 11:51 a.m.
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Simon Glass <sjg@chromium.org>
---

Changes for v2
  - No change

 arch/sandbox/cpu/Makefile | 23 +----------------------
 arch/sandbox/lib/Makefile | 25 +------------------------
 2 files changed, 2 insertions(+), 46 deletions(-)
Simon Glass - Oct. 3, 2013, 11:40 p.m.
On Thu, Sep 26, 2013 at 5:51 AM, Masahiro Yamada
<yamada.m@jp.panasonic.com>wrote:

> Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
> Cc: Simon Glass <sjg@chromium.org>
> ---
>
> Changes for v2
>   - No change
>
>  arch/sandbox/cpu/Makefile | 23 +----------------------
>  arch/sandbox/lib/Makefile | 25 +------------------------
>  2 files changed, 2 insertions(+), 46 deletions(-)
>

Acked-by: Simon Glass <sjg@chromium.org>

Seems to work for me.

Regards,
Simon

Patch

diff --git a/arch/sandbox/cpu/Makefile b/arch/sandbox/cpu/Makefile
index e386867..404ff67 100644
--- a/arch/sandbox/cpu/Makefile
+++ b/arch/sandbox/cpu/Makefile
@@ -7,29 +7,8 @@ 
 # SPDX-License-Identifier:	GPL-2.0+
 #
 
-include $(TOPDIR)/config.mk
-
-LIB	= $(obj)lib$(CPU).o
-
-COBJS	:= cpu.o os.o start.o state.o
-
-SRCS	:= $(COBJS:.o=.c)
-OBJS	:= $(addprefix $(obj),$(COBJS))
-
-all:	$(obj).depend $(LIB)
-
-$(LIB):	$(OBJS)
-	$(call cmd_link_o_target, $(OBJS))
+obj-y	:= cpu.o os.o start.o state.o
 
 # os.c is build in the system environment, so needs standard includes
 $(obj)os.o: ALL_CFLAGS := $(filter-out -nostdinc,$(ALL_CFLAGS))
 $(obj).depend.os: CPPFLAGS := $(filter-out -nostdinc,$(CPPFLAGS))
-
-#########################################################################
-
-# defines $(obj).depend target
-include $(SRCTREE)/rules.mk
-
-sinclude $(obj).depend
-
-#########################################################################
diff --git a/arch/sandbox/lib/Makefile b/arch/sandbox/lib/Makefile
index 993fb4e..4c1a38d 100644
--- a/arch/sandbox/lib/Makefile
+++ b/arch/sandbox/lib/Makefile
@@ -7,28 +7,5 @@ 
 # SPDX-License-Identifier:	GPL-2.0+
 #
 
-include $(TOPDIR)/config.mk
 
-LIB	= $(obj)lib$(ARCH).o
-
-COBJS-y	+= interrupts.o
-
-SRCS	:= $(COBJS-y:.o=.c)
-OBJS	:= $(addprefix $(obj),$(COBJS-y))
-
-# Always build libsandbox.o
-TARGETS	:= $(LIB)
-
-all:	$(TARGETS)
-
-$(LIB):	$(obj).depend $(OBJS)
-	$(call cmd_link_o_target, $(OBJS))
-
-#########################################################################
-
-# defines $(obj).depend target
-include $(SRCTREE)/rules.mk
-
-sinclude $(obj).depend
-
-#########################################################################
+obj-y	+= interrupts.o