diff options
author | Masahiro Yamada <yamada.m@jp.panasonic.com> | 2013-10-21 11:53:27 +0900 |
---|---|---|
committer | Tom Rini <trini@ti.com> | 2013-10-31 13:26:45 -0400 |
commit | 02b3bf390e25c0902a7653e05beac8c111f3dcb9 (patch) | |
tree | 5f52a7552a45cb75dfd27167ee10b08643c369f7 /arch/sh | |
parent | 774b7d5ba9a812c4c41361a8a20a14ae5c287b99 (diff) | |
download | u-boot-imx-02b3bf390e25c0902a7653e05beac8c111f3dcb9.zip u-boot-imx-02b3bf390e25c0902a7653e05beac8c111f3dcb9.tar.gz u-boot-imx-02b3bf390e25c0902a7653e05beac8c111f3dcb9.tar.bz2 |
sh: convert makefiles to Kbuild style
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
Diffstat (limited to 'arch/sh')
-rw-r--r-- | arch/sh/cpu/sh2/Makefile | 26 | ||||
-rw-r--r-- | arch/sh/cpu/sh3/Makefile | 26 | ||||
-rw-r--r-- | arch/sh/cpu/sh4/Makefile | 26 | ||||
-rw-r--r-- | arch/sh/lib/Makefile | 56 |
4 files changed, 18 insertions, 116 deletions
diff --git a/arch/sh/cpu/sh2/Makefile b/arch/sh/cpu/sh2/Makefile index 686bb79..a19ed5e 100644 --- a/arch/sh/cpu/sh2/Makefile +++ b/arch/sh/cpu/sh2/Makefile @@ -8,27 +8,5 @@ # SPDX-License-Identifier: GPL-2.0+ # -include $(TOPDIR)/config.mk - -LIB = $(obj)lib$(CPU).o - -START = start.o -COBJS = cpu.o interrupts.o watchdog.o - -SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) -OBJS := $(addprefix $(obj),$(COBJS)) -SOBJS := $(addprefix $(obj),$(SOBJS)) - -all: $(START) $(LIB) - -$(LIB): $(OBJS) $(SOBJS) - $(call cmd_link_o_target, $(OBJS) $(SOBJS)) - -######################################################################### - -# defines $(obj).depend target -include $(SRCTREE)/rules.mk - -sinclude $(obj).depend - -######################################################################### +extra-y = start.o +obj-y = cpu.o interrupts.o watchdog.o diff --git a/arch/sh/cpu/sh3/Makefile b/arch/sh/cpu/sh3/Makefile index 26cb1ce..1dccaf9 100644 --- a/arch/sh/cpu/sh3/Makefile +++ b/arch/sh/cpu/sh3/Makefile @@ -11,27 +11,5 @@ # SPDX-License-Identifier: GPL-2.0+ # -include $(TOPDIR)/config.mk - -LIB = $(obj)lib$(CPU).o - -START = start.o -COBJS = cpu.o interrupts.o watchdog.o cache.o - -SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) -OBJS := $(addprefix $(obj),$(COBJS)) -SOBJS := $(addprefix $(obj),$(SOBJS)) - -all: $(START) $(LIB) - -$(LIB): $(OBJS) $(SOBJS) - $(call cmd_link_o_target, $(OBJS) $(SOBJS)) - -######################################################################### - -# defines $(obj).depend target -include $(SRCTREE)/rules.mk - -sinclude $(obj).depend - -######################################################################### +extra-y = start.o +obj-y = cpu.o interrupts.o watchdog.o cache.o diff --git a/arch/sh/cpu/sh4/Makefile b/arch/sh/cpu/sh4/Makefile index 5680d61..38c6188 100644 --- a/arch/sh/cpu/sh4/Makefile +++ b/arch/sh/cpu/sh4/Makefile @@ -8,27 +8,5 @@ # SPDX-License-Identifier: GPL-2.0+ # -include $(TOPDIR)/config.mk - -LIB = $(obj)lib$(CPU).o - -START = start.o -COBJS = cpu.o interrupts.o watchdog.o cache.o - -SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) -OBJS := $(addprefix $(obj),$(COBJS)) -SOBJS := $(addprefix $(obj),$(SOBJS)) - -all: $(START) $(LIB) - -$(LIB): $(OBJS) $(SOBJS) - $(call cmd_link_o_target, $(OBJS) $(SOBJS)) - -######################################################################### - -# defines $(obj).depend target -include $(SRCTREE)/rules.mk - -sinclude $(obj).depend - -######################################################################### +extra-y = start.o +obj-y = cpu.o interrupts.o watchdog.o cache.o diff --git a/arch/sh/lib/Makefile b/arch/sh/lib/Makefile index 8165963..5fc9d9d 100644 --- a/arch/sh/lib/Makefile +++ b/arch/sh/lib/Makefile @@ -5,57 +5,25 @@ # SPDX-License-Identifier: GPL-2.0+ # -include $(TOPDIR)/config.mk -LIB = $(obj)lib$(ARCH).o -LIBGCC = $(obj)libgcc.o - -SOBJS-y += -GLSOBJS += ashiftrt.o -GLSOBJS += ashiftlt.o -GLSOBJS += lshiftrt.o -GLSOBJS += ashldi3.o -GLSOBJS += ashrsi3.o -GLSOBJS += lshrdi3.o -GLSOBJS += movmem.o - -COBJS-y += board.o -COBJS-$(CONFIG_CMD_BOOTM) += bootm.o +obj-y += board.o +obj-$(CONFIG_CMD_BOOTM) += bootm.o ifeq ($(CONFIG_SH2),y) -COBJS-y += time_sh2.o +obj-y += time_sh2.o else -COBJS-y += time.o -endif -ifeq ($(CONFIG_CMD_SH_ZIMAGEBOOT),y) -COBJS-y += zimageboot.o +obj-y += time.o endif +obj-$(CONFIG_CMD_SH_ZIMAGEBOOT) += zimageboot.o -SRCS := $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c) -OBJS := $(addprefix $(obj),$(SOBJS-y) $(COBJS-y)) -LGOBJS := $(addprefix $(obj),$(GLSOBJS)) \ - $(addprefix $(obj),$(GLCOBJS)) -# Always build libsh.o -TARGETS := $(LIB) # Build private libgcc only when asked for ifdef USE_PRIVATE_LIBGCC -TARGETS += $(LIBGCC) +lib-y += ashiftrt.o +lib-y += ashiftlt.o +lib-y += lshiftrt.o +lib-y += ashldi3.o +lib-y += ashrsi3.o +lib-y += lshrdi3.o +lib-y += movmem.o endif - -all: $(TARGETS) - -$(LIB): $(obj).depend $(OBJS) - $(call cmd_link_o_target, $(OBJS)) - -$(LIBGCC): $(obj).depend $(LGOBJS) - $(call cmd_link_o_target, $(LGOBJS)) - -######################################################################### - -# defines $(obj).depend target -include $(SRCTREE)/rules.mk - -sinclude $(obj).depend - -######################################################################### |