* [U-Boot] [PATCH] nds32: Convert Makefiles to use COBJS-y style
@ 2013-07-24 18:24 Kuan-Yu Kuo
2013-07-25 9:43 ` Macpaul Lin
0 siblings, 1 reply; 2+ messages in thread
From: Kuan-Yu Kuo @ 2013-07-24 18:24 UTC (permalink / raw)
To: u-boot
Signed-off-by: Kuan-Yu Kuo <ken.kuoky@gmail.com>
Cc: Macpaul Lin <macpaul@gmail.com>
---
arch/nds32/cpu/n1213/Makefile | 4 ++--
arch/nds32/cpu/n1213/ag101/Makefile | 8 ++++----
arch/nds32/cpu/n1213/ag102/Makefile | 8 ++++----
arch/nds32/lib/Makefile | 9 ++++++---
board/AndesTech/adp-ag101/Makefile | 6 +++---
board/AndesTech/adp-ag101p/Makefile | 6 +++---
board/AndesTech/adp-ag102/Makefile | 4 ++--
7 files changed, 24 insertions(+), 21 deletions(-)
diff --git a/arch/nds32/cpu/n1213/Makefile b/arch/nds32/cpu/n1213/Makefile
index da15574..7e80082 100644
--- a/arch/nds32/cpu/n1213/Makefile
+++ b/arch/nds32/cpu/n1213/Makefile
@@ -31,8 +31,8 @@ LIB = $(obj)lib$(CPU).o
START = start.o
-SRCS := $(START:.o=.S) $(SOBJS:.o=.S) $(COBJS:.o=.c)
-OBJS := $(addprefix $(obj),$(COBJS) $(SOBJS))
+SRCS := $(START:.o=.S) $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c)
+OBJS := $(addprefix $(obj),$(COBJS-y) $(SOBJS-y))
START := $(addprefix $(obj),$(START))
all: $(obj).depend $(START) $(LIB)
diff --git a/arch/nds32/cpu/n1213/ag101/Makefile b/arch/nds32/cpu/n1213/ag101/Makefile
index 8716c4e..737a972 100644
--- a/arch/nds32/cpu/n1213/ag101/Makefile
+++ b/arch/nds32/cpu/n1213/ag101/Makefile
@@ -33,15 +33,15 @@ LIB = $(obj)lib$(SOC).o
COBJS-y := cpu.o timer.o
ifndef CONFIG_SKIP_LOWLEVEL_INIT
-SOBJS := lowlevel_init.o
+SOBJS-y := lowlevel_init.o
endif
ifndef CONFIG_SKIP_TRUNOFF_WATCHDOG
-SOBJS += watchdog.o
+SOBJS-y += watchdog.o
endif
-SRCS := $(SOBJS:.o=.S) $(COBJS-y:.o=.c)
-OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS-y))
+SRCS := $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c)
+OBJS := $(addprefix $(obj),$(SOBJS-y) $(COBJS-y))
all: $(obj).depend $(LIB)
diff --git a/arch/nds32/cpu/n1213/ag102/Makefile b/arch/nds32/cpu/n1213/ag102/Makefile
index 8716c4e..737a972 100644
--- a/arch/nds32/cpu/n1213/ag102/Makefile
+++ b/arch/nds32/cpu/n1213/ag102/Makefile
@@ -33,15 +33,15 @@ LIB = $(obj)lib$(SOC).o
COBJS-y := cpu.o timer.o
ifndef CONFIG_SKIP_LOWLEVEL_INIT
-SOBJS := lowlevel_init.o
+SOBJS-y := lowlevel_init.o
endif
ifndef CONFIG_SKIP_TRUNOFF_WATCHDOG
-SOBJS += watchdog.o
+SOBJS-y += watchdog.o
endif
-SRCS := $(SOBJS:.o=.S) $(COBJS-y:.o=.c)
-OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS-y))
+SRCS := $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c)
+OBJS := $(addprefix $(obj),$(SOBJS-y) $(COBJS-y))
all: $(obj).depend $(LIB)
diff --git a/arch/nds32/lib/Makefile b/arch/nds32/lib/Makefile
index 705e1ff..022b21a 100644
--- a/arch/nds32/lib/Makefile
+++ b/arch/nds32/lib/Makefile
@@ -29,12 +29,15 @@ include $(TOPDIR)/config.mk
LIB = $(obj)lib$(ARCH).o
-OBJS := board.o cache.o interrupts.o
+COBJS-y += board.o
+COBJS-y += cache.o
COBJS-$(CONFIG_CMD_BOOTM) += bootm.o
+COBJS-y += interrupts.o
-all: $(LIB)
+SRCS := $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c)
+OBJS := $(addprefix $(obj),$(SOBJS-y) $(COBJS-y))
-$(LIB): $(OBJS) $(SOBJS)
+$(LIB): $(obj).depend $(OBJS)
$(call cmd_link_o_target, $(OBJS))
#########################################################################
diff --git a/board/AndesTech/adp-ag101/Makefile b/board/AndesTech/adp-ag101/Makefile
index d55a799..867e1cf 100644
--- a/board/AndesTech/adp-ag101/Makefile
+++ b/board/AndesTech/adp-ag101/Makefile
@@ -26,10 +26,10 @@ include $(TOPDIR)/config.mk
LIB = $(obj)lib$(BOARD).o
-COBJS := adp-ag101.o
+COBJS-y := adp-ag101.o
-SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
-OBJS := $(addprefix $(obj),$(COBJS) $(SOBJS))
+SRCS := $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c)
+OBJS := $(addprefix $(obj),$(COBJS-y) $(SOBJS-y))
$(LIB): $(OBJS)
$(call cmd_link_o_target, $(OBJS))
diff --git a/board/AndesTech/adp-ag101p/Makefile b/board/AndesTech/adp-ag101p/Makefile
index 03c3ff4..5f513c8 100644
--- a/board/AndesTech/adp-ag101p/Makefile
+++ b/board/AndesTech/adp-ag101p/Makefile
@@ -26,10 +26,10 @@ include $(TOPDIR)/config.mk
LIB = $(obj)lib$(BOARD).o
-COBJS := adp-ag101p.o
+COBJS-y := adp-ag101p.o
-SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
-OBJS := $(addprefix $(obj),$(COBJS) $(SOBJS))
+SRCS := $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c)
+OBJS := $(addprefix $(obj),$(COBJS-y) $(SOBJS-y))
$(LIB): $(OBJS)
$(call cmd_link_o_target, $(OBJS))
diff --git a/board/AndesTech/adp-ag102/Makefile b/board/AndesTech/adp-ag102/Makefile
index 1cbf2d4..44f117d 100644
--- a/board/AndesTech/adp-ag102/Makefile
+++ b/board/AndesTech/adp-ag102/Makefile
@@ -27,8 +27,8 @@ LIB = $(obj)lib$(BOARD).o
COBJS := adp-ag102.o
-SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
-OBJS := $(addprefix $(obj),$(COBJS) $(SOBJS))
+SRCS := $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c)
+OBJS := $(addprefix $(obj),$(COBJS-y) $(SOBJS-y))
$(LIB): $(OBJS)
$(call cmd_link_o_target, $(OBJS))
--
1.7.9.5
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [U-Boot] [PATCH] nds32: Convert Makefiles to use COBJS-y style
2013-07-24 18:24 [U-Boot] [PATCH] nds32: Convert Makefiles to use COBJS-y style Kuan-Yu Kuo
@ 2013-07-25 9:43 ` Macpaul Lin
0 siblings, 0 replies; 2+ messages in thread
From: Macpaul Lin @ 2013-07-25 9:43 UTC (permalink / raw)
To: u-boot
Hi Kuan-Yu,
2013/7/25 Kuan-Yu Kuo <ken.kuoky@gmail.com>:
> Signed-off-by: Kuan-Yu Kuo <ken.kuoky@gmail.com>
> Cc: Macpaul Lin <macpaul@gmail.com>
> ---
> arch/nds32/cpu/n1213/Makefile | 4 ++--
> arch/nds32/cpu/n1213/ag101/Makefile | 8 ++++----
> arch/nds32/cpu/n1213/ag102/Makefile | 8 ++++----
> arch/nds32/lib/Makefile | 9 ++++++---
> board/AndesTech/adp-ag101/Makefile | 6 +++---
> board/AndesTech/adp-ag101p/Makefile | 6 +++---
> board/AndesTech/adp-ag102/Makefile | 4 ++--
> 7 files changed, 24 insertions(+), 21 deletions(-)
>
Applied to u-boot-nds32.
Thanks!
--
Best regards,
Macpaul Lin
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-07-25 9:43 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-07-24 18:24 [U-Boot] [PATCH] nds32: Convert Makefiles to use COBJS-y style Kuan-Yu Kuo
2013-07-25 9:43 ` Macpaul Lin
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.