diff options
| author | Masahiro Yamada <yamada.m@jp.panasonic.com> | 2013-10-17 17:34:50 +0900 | 
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-10-31 12:53:39 -0400 | 
| commit | 833db7405a3c8c5ed12e067717c1feb05003bbab (patch) | |
| tree | 44c2fae36e64259e46f67f64536fb4118df3e1a8 | |
| parent | d8769c62c1f48818725c9741c275299b4cb86b19 (diff) | |
| download | olio-uboot-2014.01-833db7405a3c8c5ed12e067717c1feb05003bbab.tar.xz olio-uboot-2014.01-833db7405a3c8c5ed12e067717c1feb05003bbab.zip | |
arm920t: convert makefiles to Kbuild style
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
| -rw-r--r-- | arch/arm/cpu/arm920t/Makefile | 28 | ||||
| -rw-r--r-- | arch/arm/cpu/arm920t/a320/Makefile | 25 | ||||
| -rw-r--r-- | arch/arm/cpu/arm920t/at91/Makefile | 33 | ||||
| -rw-r--r-- | arch/arm/cpu/arm920t/ep93xx/Makefile | 24 | ||||
| -rw-r--r-- | arch/arm/cpu/arm920t/imx/Makefile | 27 | ||||
| -rw-r--r-- | arch/arm/cpu/arm920t/ks8695/Makefile | 26 | ||||
| -rw-r--r-- | arch/arm/cpu/arm920t/s3c24x0/Makefile | 29 | 
7 files changed, 22 insertions, 170 deletions
| diff --git a/arch/arm/cpu/arm920t/Makefile b/arch/arm/cpu/arm920t/Makefile index 4758f025a..aac8043f6 100644 --- a/arch/arm/cpu/arm920t/Makefile +++ b/arch/arm/cpu/arm920t/Makefile @@ -5,29 +5,7 @@  # SPDX-License-Identifier:	GPL-2.0+  # -include $(TOPDIR)/config.mk +extra-y	= start.o -LIB	= $(obj)lib$(CPU).o - -START	= start.o - -COBJS-y	+= cpu.o -COBJS-$(CONFIG_USE_IRQ)	+= interrupts.o - -SRCS	:= $(START:.o=.S) $(SOBJS:.o=.S) $(COBJS-y:.o=.c) -OBJS	:= $(addprefix $(obj),$(COBJS-y) $(SOBJS)) -START	:= $(addprefix $(obj),$(START)) - -all:	$(obj).depend $(START) $(LIB) - -$(LIB):	$(OBJS) -	$(call cmd_link_o_target, $(OBJS)) - -######################################################################### - -# defines $(obj).depend target -include $(SRCTREE)/rules.mk - -sinclude $(obj).depend - -######################################################################### +obj-y	+= cpu.o +obj-$(CONFIG_USE_IRQ)	+= interrupts.o diff --git a/arch/arm/cpu/arm920t/a320/Makefile b/arch/arm/cpu/arm920t/a320/Makefile index 88c7d9bb7..bbdab588c 100644 --- a/arch/arm/cpu/arm920t/a320/Makefile +++ b/arch/arm/cpu/arm920t/a320/Makefile @@ -5,26 +5,5 @@  # SPDX-License-Identifier:	GPL-2.0+  # -include $(TOPDIR)/config.mk - -LIB	= $(obj)lib$(SOC).o - -SOBJS	+= reset.o -COBJS	+= timer.o - -SRCS	:= $(SOBJS:.o=.S) $(COBJS:.o=.c) -OBJS	:= $(addprefix $(obj),$(SOBJS) $(COBJS)) - -all:	$(obj).depend $(LIB) - -$(LIB):	$(OBJS) -	$(call cmd_link_o_target, $(OBJS)) - -######################################################################### - -# defines $(obj).depend target -include $(SRCTREE)/rules.mk - -sinclude $(obj).depend - -######################################################################### +obj-y	+= reset.o +obj-y	+= timer.o diff --git a/arch/arm/cpu/arm920t/at91/Makefile b/arch/arm/cpu/arm920t/at91/Makefile index b2b1e56a9..561b4b4cb 100644 --- a/arch/arm/cpu/arm920t/at91/Makefile +++ b/arch/arm/cpu/arm920t/at91/Makefile @@ -5,30 +5,9 @@  # SPDX-License-Identifier:	GPL-2.0+  # -include $(TOPDIR)/config.mk - -LIB	= $(obj)lib$(SOC).o - -SOBJS	+= lowlevel_init.o -COBJS	+= reset.o -COBJS	+= timer.o -COBJS	+= clock.o -COBJS	+= cpu.o -COBJS	+= at91rm9200_devices.o - -SRCS	:= $(SOBJS:.o=.S) $(COBJS:.o=.c) -OBJS	:= $(addprefix $(obj),$(SOBJS) $(COBJS)) - -all:	$(obj).depend $(LIB) - -$(LIB):	$(OBJS) -	$(call cmd_link_o_target, $(OBJS)) - -######################################################################### - -# defines $(obj).depend target -include $(SRCTREE)/rules.mk - -sinclude $(obj).depend - -######################################################################### +obj-y	+= lowlevel_init.o +obj-y	+= reset.o +obj-y	+= timer.o +obj-y	+= clock.o +obj-y	+= cpu.o +obj-y	+= at91rm9200_devices.o diff --git a/arch/arm/cpu/arm920t/ep93xx/Makefile b/arch/arm/cpu/arm920t/ep93xx/Makefile index 7a75c86ae..638333a48 100644 --- a/arch/arm/cpu/arm920t/ep93xx/Makefile +++ b/arch/arm/cpu/arm920t/ep93xx/Makefile @@ -16,26 +16,6 @@  #  # SPDX-License-Identifier:	GPL-2.0+  # -include $(TOPDIR)/config.mk -LIB = $(obj)lib$(SOC).o - -COBJS   = cpu.o led.o speed.o timer.o -SOBJS   = lowlevel_init.o - -SRCS    := $(SOBJS:.o=.S) $(COBJS:.o=.c) -OBJS    := $(addprefix $(obj),$(SOBJS) $(COBJS)) - -all:    $(obj).depend $(LIB) - -$(LIB): $(OBJS) -	$(call cmd_link_o_target, $(OBJS)) - -######################################################################### - -# defines $(obj).depend target -include $(SRCTREE)/rules.mk - -sinclude $(obj).depend - -######################################################################### +obj-y   = cpu.o led.o speed.o timer.o +obj-y   += lowlevel_init.o diff --git a/arch/arm/cpu/arm920t/imx/Makefile b/arch/arm/cpu/arm920t/imx/Makefile index c9c85b874..54ce646d9 100644 --- a/arch/arm/cpu/arm920t/imx/Makefile +++ b/arch/arm/cpu/arm920t/imx/Makefile @@ -5,27 +5,6 @@  # SPDX-License-Identifier:	GPL-2.0+  # -include $(TOPDIR)/config.mk - -LIB	= $(obj)lib$(SOC).o - -COBJS	+= generic.o -COBJS	+= speed.o -COBJS	+= timer.o - -SRCS	:= $(SOBJS:.o=.S) $(COBJS:.o=.c) -OBJS	:= $(addprefix $(obj),$(SOBJS) $(COBJS)) - -all:	$(obj).depend $(LIB) - -$(LIB):	$(OBJS) -	$(call cmd_link_o_target, $(OBJS)) - -######################################################################### - -# defines $(obj).depend target -include $(SRCTREE)/rules.mk - -sinclude $(obj).depend - -######################################################################### +obj-y	+= generic.o +obj-y	+= speed.o +obj-y	+= timer.o diff --git a/arch/arm/cpu/arm920t/ks8695/Makefile b/arch/arm/cpu/arm920t/ks8695/Makefile index eef053050..400aa89e9 100644 --- a/arch/arm/cpu/arm920t/ks8695/Makefile +++ b/arch/arm/cpu/arm920t/ks8695/Makefile @@ -5,27 +5,5 @@  # SPDX-License-Identifier:	GPL-2.0+  # -include $(TOPDIR)/config.mk - -LIB	= $(obj)lib$(SOC).o - -SOBJS	= lowlevel_init.o - -COBJS	= timer.o - -SRCS	:= $(SOBJS:.o=.S) $(COBJS:.o=.c) -OBJS	:= $(addprefix $(obj),$(SOBJS) $(COBJS)) - -all:	$(obj).depend $(LIB) - -$(LIB):	$(OBJS) -	$(call cmd_link_o_target, $(OBJS)) - -######################################################################### - -# defines $(obj).depend target -include $(SRCTREE)/rules.mk - -sinclude $(obj).depend - -######################################################################### +obj-y	= lowlevel_init.o +obj-y	+= timer.o diff --git a/arch/arm/cpu/arm920t/s3c24x0/Makefile b/arch/arm/cpu/arm920t/s3c24x0/Makefile index 97175330e..e44c549ba 100644 --- a/arch/arm/cpu/arm920t/s3c24x0/Makefile +++ b/arch/arm/cpu/arm920t/s3c24x0/Makefile @@ -5,28 +5,7 @@  # SPDX-License-Identifier:	GPL-2.0+  # -include $(TOPDIR)/config.mk - -LIB	= $(obj)lib$(SOC).o - -COBJS-$(CONFIG_USE_IRQ) += interrupts.o -COBJS-$(CONFIG_DISPLAY_CPUINFO)	+= cpu_info.o -COBJS-y	+= speed.o -COBJS-y	+= timer.o - -SRCS	:= $(SOBJS:.o=.S) $(COBJS-y:.o=.c) -OBJS	:= $(addprefix $(obj),$(SOBJS) $(COBJS-y)) - -all:	$(obj).depend $(LIB) - -$(LIB):	$(OBJS) -	$(call cmd_link_o_target, $(OBJS)) - -######################################################################### - -# defines $(obj).depend target -include $(SRCTREE)/rules.mk - -sinclude $(obj).depend - -######################################################################### +obj-$(CONFIG_USE_IRQ) += interrupts.o +obj-$(CONFIG_DISPLAY_CPUINFO)	+= cpu_info.o +obj-y	+= speed.o +obj-y	+= timer.o |