diff options
22 files changed, 101 insertions, 579 deletions
| diff --git a/arch/arm/cpu/armv7/Makefile b/arch/arm/cpu/armv7/Makefile index ee4b02183..8a8b60274 100644 --- a/arch/arm/cpu/armv7/Makefile +++ b/arch/arm/cpu/armv7/Makefile @@ -5,40 +5,18 @@  # SPDX-License-Identifier:	GPL-2.0+  # -include $(TOPDIR)/config.mk +extra-y	:= start.o -LIB	= $(obj)lib$(CPU).o +obj-y	+= cache_v7.o -START	:= start.o - -COBJS	+= cache_v7.o - -COBJS	+= cpu.o -COBJS	+= syslib.o +obj-y	+= cpu.o +obj-y	+= syslib.o  ifneq ($(CONFIG_AM43XX)$(CONFIG_AM33XX)$(CONFIG_OMAP44XX)$(CONFIG_OMAP54XX)$(CONFIG_TEGRA)$(CONFIG_MX6)$(CONFIG_TI81XX),) -SOBJS	+= lowlevel_init.o +obj-y	+= lowlevel_init.o  endif  ifneq ($(CONFIG_ARMV7_NONSEC)$(CONFIG_ARMV7_VIRT),) -SOBJS	+= nonsec_virt.o -COBJS	+= virt-v7.o +obj-y	+= nonsec_virt.o +obj-y	+= virt-v7.o  endif - -SRCS	:= $(START:.o=.S) $(COBJS:.o=.c) -OBJS	:= $(addprefix $(obj),$(COBJS) $(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 - -######################################################################### diff --git a/arch/arm/cpu/armv7/am33xx/Makefile b/arch/arm/cpu/armv7/am33xx/Makefile index f6a297c9d..966fcab71 100644 --- a/arch/arm/cpu/armv7/am33xx/Makefile +++ b/arch/arm/cpu/armv7/am33xx/Makefile @@ -4,46 +4,19 @@  # SPDX-License-Identifier:	GPL-2.0+  # -include $(TOPDIR)/config.mk - -LIB	= $(obj)lib$(SOC).o - -COBJS-$(CONFIG_AM33XX)	+= clock_am33xx.o -COBJS-$(CONFIG_TI814X)	+= clock_ti814x.o -COBJS-$(CONFIG_AM43XX)	+= clock_am43xx.o +obj-$(CONFIG_AM33XX)	+= clock_am33xx.o +obj-$(CONFIG_TI814X)	+= clock_ti814x.o +obj-$(CONFIG_AM43XX)	+= clock_am43xx.o  ifneq ($(CONFIG_AM43XX)$(CONFIG_AM33XX),) -COBJS	+= clock.o +obj-y	+= clock.o  endif -COBJS-$(CONFIG_TI816X)	+= clock_ti816x.o -COBJS	+= sys_info.o -COBJS	+= mem.o -COBJS	+= ddr.o -COBJS	+= emif4.o -COBJS	+= board.o -COBJS	+= mux.o -COBJS-$(CONFIG_NAND_OMAP_GPMC)	+= elm.o - -SRCS	:= $(SOBJS:.o=.S) $(COBJS:.o=.c) -OBJS	:= $(addprefix $(obj),$(COBJS) $(COBJS-y) $(SOBJS)) - -all:	$(obj).depend $(LIB) - -$(LIB):	$(OBJS) -	$(call cmd_link_o_target, $(OBJS)) - -clean: -	rm -f $(SOBJS) $(OBJS) - -distclean:	clean -	rm -f $(LIB) core *.bak .depend - -######################################################################### - -# defines $(obj).depend target -include $(SRCTREE)/rules.mk - -sinclude $(obj).depend - -######################################################################### +obj-$(CONFIG_TI816X)	+= clock_ti816x.o +obj-y	+= sys_info.o +obj-y	+= mem.o +obj-y	+= ddr.o +obj-y	+= emif4.o +obj-y	+= board.o +obj-y	+= mux.o +obj-$(CONFIG_NAND_OMAP_GPMC)	+= elm.o diff --git a/arch/arm/cpu/armv7/at91/Makefile b/arch/arm/cpu/armv7/at91/Makefile index 90b9bd68d..0a2e48d04 100644 --- a/arch/arm/cpu/armv7/at91/Makefile +++ b/arch/arm/cpu/armv7/at91/Makefile @@ -8,29 +8,8 @@  # SPDX-License-Identifier:	GPL-2.0+  # -include $(TOPDIR)/config.mk - -LIB	= $(obj)lib$(SOC).o - -COBJS-$(CONFIG_SAMA5D3)	+= sama5d3_devices.o -COBJS-y += clock.o -COBJS-y += cpu.o -COBJS-y += reset.o -COBJS-y += timer.o - -SRCS    := $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c) -OBJS    := $(addprefix $(obj),$(SOBJS-y) $(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_SAMA5D3)	+= sama5d3_devices.o +obj-y += clock.o +obj-y += cpu.o +obj-y += reset.o +obj-y += timer.o diff --git a/arch/arm/cpu/armv7/exynos/Makefile b/arch/arm/cpu/armv7/exynos/Makefile index eb1633fcf..e207bd6af 100644 --- a/arch/arm/cpu/armv7/exynos/Makefile +++ b/arch/arm/cpu/armv7/exynos/Makefile @@ -5,34 +5,12 @@  # SPDX-License-Identifier:	GPL-2.0+  # -include $(TOPDIR)/config.mk - -LIB	= $(obj)lib$(SOC).o - -COBJS-y	+= clock.o power.o soc.o system.o pinmux.o tzpc.o +obj-y	+= clock.o power.o soc.o system.o pinmux.o tzpc.o  ifdef CONFIG_SPL_BUILD -COBJS-$(CONFIG_EXYNOS5)	+= clock_init_exynos5.o -COBJS-$(CONFIG_EXYNOS5)	+= dmc_common.o dmc_init_ddr3.o -COBJS-$(CONFIG_EXYNOS4210)+= dmc_init_exynos4.o clock_init_exynos4.o -COBJS-y	+= spl_boot.o -COBJS-y	+= lowlevel_init.o +obj-$(CONFIG_EXYNOS5)	+= clock_init_exynos5.o +obj-$(CONFIG_EXYNOS5)	+= dmc_common.o dmc_init_ddr3.o +obj-$(CONFIG_EXYNOS4210)+= dmc_init_exynos4.o clock_init_exynos4.o +obj-y	+= spl_boot.o +obj-y	+= lowlevel_init.o  endif - -COBJS   := $(COBJS-y) -SRCS	:= $(COBJS:.o=.c) -OBJS	:= $(addprefix $(obj),$(COBJS)) - -all:	 $(obj).depend $(LIB) - -$(LIB):	$(OBJS) -	$(call cmd_link_o_target, $(OBJS)) - -######################################################################### - -# defines $(obj).depend target -include $(SRCTREE)/rules.mk - -sinclude $(obj).depend - -######################################################################### diff --git a/arch/arm/cpu/armv7/highbank/Makefile b/arch/arm/cpu/armv7/highbank/Makefile index 22e3b72c8..876099d9a 100644 --- a/arch/arm/cpu/armv7/highbank/Makefile +++ b/arch/arm/cpu/armv7/highbank/Makefile @@ -5,26 +5,4 @@  # SPDX-License-Identifier:	GPL-2.0+  # -include $(TOPDIR)/config.mk - -LIB	= $(obj)lib$(SOC).o - -COBJS	:= timer.o -SOBJS	:= - -SRCS	:= $(SOBJS:.o=.S) $(COBJS:.o=.c) -OBJS	:= $(addprefix $(obj),$(COBJS) $(SOBJS)) - -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	:= timer.o diff --git a/arch/arm/cpu/armv7/mx5/Makefile b/arch/arm/cpu/armv7/mx5/Makefile index 7c86ae3ea..d021842f6 100644 --- a/arch/arm/cpu/armv7/mx5/Makefile +++ b/arch/arm/cpu/armv7/mx5/Makefile @@ -7,26 +7,5 @@  # SPDX-License-Identifier:	GPL-2.0+  # -include $(TOPDIR)/config.mk - -LIB	= $(obj)lib$(SOC).o - -COBJS	= soc.o clock.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 := soc.o clock.o +obj-y += lowlevel_init.o diff --git a/arch/arm/cpu/armv7/mx6/Makefile b/arch/arm/cpu/armv7/mx6/Makefile index 6d736174d..d7285fc2c 100644 --- a/arch/arm/cpu/armv7/mx6/Makefile +++ b/arch/arm/cpu/armv7/mx6/Makefile @@ -7,26 +7,5 @@  # SPDX-License-Identifier:	GPL-2.0+  # -include $(TOPDIR)/config.mk - -LIB	= $(obj)lib$(SOC).o - -COBJS-y	= soc.o clock.o -COBJS-$(CONFIG_SECURE_BOOT)	+= hab.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-y	:= soc.o clock.o +obj-$(CONFIG_SECURE_BOOT)    += hab.o diff --git a/arch/arm/cpu/armv7/omap-common/Makefile b/arch/arm/cpu/armv7/omap-common/Makefile index 75b375326..4d3a165f5 100644 --- a/arch/arm/cpu/armv7/omap-common/Makefile +++ b/arch/arm/cpu/armv7/omap-common/Makefile @@ -5,46 +5,25 @@  # SPDX-License-Identifier:	GPL-2.0+  # -include $(TOPDIR)/config.mk - -LIB	= $(obj)libomap-common.o - -COBJS	:= reset.o -COBJS	+= timer.o -COBJS	+= utils.o +obj-y	:= reset.o +obj-y	+= timer.o +obj-y	+= utils.o  ifneq ($(CONFIG_OMAP44XX)$(CONFIG_OMAP54XX),) -COBJS	+= hwinit-common.o -COBJS	+= clocks-common.o -COBJS	+= emif-common.o -COBJS	+= vc.o -COBJS	+= abb.o +obj-y	+= hwinit-common.o +obj-y	+= clocks-common.o +obj-y	+= emif-common.o +obj-y	+= vc.o +obj-y	+= abb.o  endif  ifeq ($(CONFIG_OMAP34XX),) -COBJS	+= boot-common.o -SOBJS	+= lowlevel_init.o +obj-y	+= boot-common.o +obj-y	+= lowlevel_init.o  endif  ifndef CONFIG_SPL_BUILD  ifneq ($(CONFIG_OMAP44XX)$(CONFIG_OMAP54XX),) -COBJS	+= mem-common.o +obj-y	+= mem-common.o  endif  endif - -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 - -######################################################################### diff --git a/arch/arm/cpu/armv7/omap3/Makefile b/arch/arm/cpu/armv7/omap3/Makefile index f070c1819..39ff2575b 100644 --- a/arch/arm/cpu/armv7/omap3/Makefile +++ b/arch/arm/cpu/armv7/omap3/Makefile @@ -5,38 +5,17 @@  # SPDX-License-Identifier:	GPL-2.0+  # -include $(TOPDIR)/config.mk +obj-y	:= lowlevel_init.o -LIB	=  $(obj)lib$(SOC).o - -SOBJS	:= lowlevel_init.o - -COBJS	+= board.o -COBJS	+= clock.o -COBJS	+= mem.o -COBJS	+= sys_info.o +obj-y	+= board.o +obj-y	+= clock.o +obj-y	+= mem.o +obj-y	+= sys_info.o  ifdef CONFIG_SPL_BUILD -COBJS-$(CONFIG_SPL_OMAP3_ID_NAND)	+= spl_id_nand.o +obj-$(CONFIG_SPL_OMAP3_ID_NAND)	+= spl_id_nand.o  endif -COBJS-$(CONFIG_DRIVER_TI_EMAC)	+= emac.o -COBJS-$(CONFIG_EMIF4)	+= emif4.o -COBJS-$(CONFIG_SDRC)	+= sdrc.o -COBJS-$(CONFIG_USB_MUSB_AM35X)	+= am35x_musb.o - -SRCS	:= $(SOBJS:.o=.S) $(COBJS:.o=.c) -OBJS	:= $(addprefix $(obj),$(COBJS) $(COBJS-y) $(SOBJS)) - -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_DRIVER_TI_EMAC)	+= emac.o +obj-$(CONFIG_EMIF4)	+= emif4.o +obj-$(CONFIG_SDRC)	+= sdrc.o +obj-$(CONFIG_USB_MUSB_AM35X)	+= am35x_musb.o diff --git a/arch/arm/cpu/armv7/omap4/Makefile b/arch/arm/cpu/armv7/omap4/Makefile index fc6e2ddd0..76a032a2d 100644 --- a/arch/arm/cpu/armv7/omap4/Makefile +++ b/arch/arm/cpu/armv7/omap4/Makefile @@ -5,29 +5,8 @@  # SPDX-License-Identifier:	GPL-2.0+  # -include $(TOPDIR)/config.mk - -LIB	=  $(obj)lib$(SOC).o - -COBJS	+= sdram_elpida.o -COBJS	+= hwinit.o -COBJS	+= emif.o -COBJS	+= prcm-regs.o -COBJS	+= hw_data.o - -SRCS	:= $(SOBJS:.o=.S) $(COBJS:.o=.c) -OBJS	:= $(addprefix $(obj),$(COBJS) $(SOBJS)) - -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	+= sdram_elpida.o +obj-y	+= hwinit.o +obj-y	+= emif.o +obj-y	+= prcm-regs.o +obj-y	+= hw_data.o diff --git a/arch/arm/cpu/armv7/omap5/Makefile b/arch/arm/cpu/armv7/omap5/Makefile index 168302dd3..64c68791f 100644 --- a/arch/arm/cpu/armv7/omap5/Makefile +++ b/arch/arm/cpu/armv7/omap5/Makefile @@ -5,30 +5,9 @@  # SPDX-License-Identifier:	GPL-2.0+  # -include $(TOPDIR)/config.mk - -LIB	=  $(obj)lib$(SOC).o - -COBJS	+= hwinit.o -COBJS	+= emif.o -COBJS	+= sdram.o -COBJS	+= prcm-regs.o -COBJS	+= hw_data.o -COBJS	+= abb.o - -SRCS	:= $(SOBJS:.o=.S) $(COBJS:.o=.c) -OBJS	:= $(addprefix $(obj),$(COBJS) $(SOBJS)) - -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	+= hwinit.o +obj-y	+= emif.o +obj-y	+= sdram.o +obj-y	+= prcm-regs.o +obj-y	+= hw_data.o +obj-y	+= abb.o diff --git a/arch/arm/cpu/armv7/rmobile/Makefile b/arch/arm/cpu/armv7/rmobile/Makefile index 41bceb1cf..8f4cf3a19 100644 --- a/arch/arm/cpu/armv7/rmobile/Makefile +++ b/arch/arm/cpu/armv7/rmobile/Makefile @@ -5,44 +5,20 @@  # SPDX-License-Identifier:	GPL-2.0+  # -include $(TOPDIR)/config.mk +obj-y = lowlevel_init.o +obj-y += cpu_info.o +obj-y += emac.o -LIB	= $(obj)lib$(SOC).o - -SOBJS = lowlevel_init.o -COBJS-y += cpu_info.o -COBJS-y += emac.o - -COBJS-$(CONFIG_DISPLAY_BOARDINFO) += board.o -COBJS-$(CONFIG_GLOBAL_TIMER) += timer.o -COBJS-$(CONFIG_R8A7740) += cpu_info-r8a7740.o -COBJS-$(CONFIG_R8A7740) += pfc-r8a7740.o -COBJS-$(CONFIG_SH73A0) += cpu_info-sh73a0.o -COBJS-$(CONFIG_SH73A0) += pfc-sh73a0.o -COBJS_LN-$(CONFIG_TMU_TIMER) += sh_timer.o - -COBJS	:= $(COBJS-y) -SRCS    := $(SOBJS:.o=.S) $(COBJS:.o=.c) -SRCS    := $(SOBJS:.o=.S) $(COBJS:.o=.c) $(addprefix $(obj),$(COBJS_LN-y:.o=.c)) -OBJS	:= $(addprefix $(obj),$(SOBJS) $(COBJS) $(COBJS_LN-y)) -SOBJS	:= $(addprefix $(obj),$(SOBJS)) -START	:= $(addprefix $(obj),$(START)) - -all:	$(obj).depend $(LIB) - -$(LIB):	$(OBJS) -	$(call cmd_link_o_target, $(OBJS)) +obj-$(CONFIG_DISPLAY_BOARDINFO) += board.o +obj-$(CONFIG_GLOBAL_TIMER) += timer.o +obj-$(CONFIG_R8A7740) += cpu_info-r8a7740.o +obj-$(CONFIG_R8A7740) += pfc-r8a7740.o +obj-$(CONFIG_SH73A0) += cpu_info-sh73a0.o +obj-$(CONFIG_SH73A0) += pfc-sh73a0.o +obj-$(CONFIG_TMU_TIMER) += sh_timer.o +SRCS += $(obj)sh_timer.c  # from arch/sh/lib/ directory  $(obj)sh_timer.c:  	@rm -f $(obj)sh_timer.c  	ln -s $(SRCTREE)/arch/sh/lib/time.c $(obj)sh_timer.c - -######################################################################### - -# defines $(obj).depend target -include $(SRCTREE)/rules.mk - -sinclude $(obj).depend - -######################################################################### diff --git a/arch/arm/cpu/armv7/s5p-common/Makefile b/arch/arm/cpu/armv7/s5p-common/Makefile index fd7290caa..f571d8a0e 100644 --- a/arch/arm/cpu/armv7/s5p-common/Makefile +++ b/arch/arm/cpu/armv7/s5p-common/Makefile @@ -5,30 +5,9 @@  # SPDX-License-Identifier:	GPL-2.0+  # -include $(TOPDIR)/config.mk - -LIB	= $(obj)libs5p-common.o - -COBJS-y		+= cpu_info.o +obj-y		+= cpu_info.o  ifndef CONFIG_SPL_BUILD -COBJS-y		+= timer.o -COBJS-y		+= sromc.o -COBJS-$(CONFIG_PWM)	+= pwm.o +obj-y		+= timer.o +obj-y		+= sromc.o +obj-$(CONFIG_PWM)	+= pwm.o  endif - -SRCS	:= $(SOBJS:.o=.S) $(COBJS:.o=.c) -OBJS	:= $(addprefix $(obj),$(COBJS-y) $(SOBJS)) - -all:	 $(obj).depend $(LIB) - -$(LIB):	$(OBJS) -	$(call cmd_link_o_target, $(OBJS)) - -######################################################################### - -# defines $(obj).depend target -include $(SRCTREE)/rules.mk - -sinclude $(obj).depend - -######################################################################### diff --git a/arch/arm/cpu/armv7/s5pc1xx/Makefile b/arch/arm/cpu/armv7/s5pc1xx/Makefile index 09fed66bf..9f43ded1d 100644 --- a/arch/arm/cpu/armv7/s5pc1xx/Makefile +++ b/arch/arm/cpu/armv7/s5pc1xx/Makefile @@ -8,28 +8,7 @@  # SPDX-License-Identifier:	GPL-2.0+  # -include $(TOPDIR)/config.mk +obj-y	= cache.o +obj-y	+= reset.o -LIB	= $(obj)lib$(SOC).o - -SOBJS	= cache.o -SOBJS	+= reset.o - -COBJS	+= clock.o - -SRCS	:= $(SOBJS:.o=.S) $(COBJS:.o=.c) -OBJS	:= $(addprefix $(obj),$(COBJS) $(SOBJS)) - -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	+= clock.o diff --git a/arch/arm/cpu/armv7/socfpga/Makefile b/arch/arm/cpu/armv7/socfpga/Makefile index 0859e443d..dac2bbdac 100644 --- a/arch/arm/cpu/armv7/socfpga/Makefile +++ b/arch/arm/cpu/armv7/socfpga/Makefile @@ -7,29 +7,6 @@  # SPDX-License-Identifier:	GPL-2.0+  # - -include $(TOPDIR)/config.mk - -LIB	=  $(obj)lib$(SOC).o - -SOBJS	:= lowlevel_init.o -COBJS-y	:= misc.o timer.o reset_manager.o system_manager.o -COBJS-$(CONFIG_SPL_BUILD) += spl.o - -COBJS	:= $(COBJS-y) -SRCS	:= $(SOBJS:.o=.S) $(COBJS:.o=.c) -OBJS	:= $(addprefix $(obj),$(COBJS) $(SOBJS)) - -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	+= misc.o timer.o reset_manager.o system_manager.o +obj-$(CONFIG_SPL_BUILD) += spl.o diff --git a/arch/arm/cpu/armv7/tegra-common/Makefile b/arch/arm/cpu/armv7/tegra-common/Makefile index d97542d89..463c260f1 100644 --- a/arch/arm/cpu/armv7/tegra-common/Makefile +++ b/arch/arm/cpu/armv7/tegra-common/Makefile @@ -7,26 +7,4 @@  # SPDX-License-Identifier:	GPL-2.0+  # -include $(TOPDIR)/config.mk - -LIB	=  $(obj)libtegra-common.o - -COBJS-$(CONFIG_CMD_ENTERRCM) += cmd_enterrcm.o - -COBJS	:= $(COBJS-y) -SRCS	:= $(COBJS:.o=.c) -OBJS	:= $(addprefix $(obj),$(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-$(CONFIG_CMD_ENTERRCM) += cmd_enterrcm.o diff --git a/arch/arm/cpu/armv7/tegra114/Makefile b/arch/arm/cpu/armv7/tegra114/Makefile index eb98c8ea1..886b5092d 100644 --- a/arch/arm/cpu/armv7/tegra114/Makefile +++ b/arch/arm/cpu/armv7/tegra114/Makefile @@ -17,24 +17,4 @@  # along with this program.  If not, see <http://www.gnu.org/licenses/>.  # -include $(TOPDIR)/config.mk - -LIB	= $(obj)lib$(SOC).o - -COBJS	:= $(COBJS-y) -SRCS	:= $(COBJS:.o=.c) -OBJS	:= $(addprefix $(obj),$(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- := diff --git a/arch/arm/cpu/armv7/tegra20/Makefile b/arch/arm/cpu/armv7/tegra20/Makefile index 4ee8e5baf..9b4295c72 100644 --- a/arch/arm/cpu/armv7/tegra20/Makefile +++ b/arch/arm/cpu/armv7/tegra20/Makefile @@ -7,27 +7,5 @@  # SPDX-License-Identifier:	GPL-2.0+  # -include $(TOPDIR)/config.mk - -LIB	=  $(obj)lib$(SOC).o - -COBJS-$(CONFIG_PWM_TEGRA) += pwm.o -COBJS-$(CONFIG_VIDEO_TEGRA) += display.o - -COBJS	:= $(COBJS-y) -SRCS	:= $(COBJS:.o=.c) -OBJS	:= $(addprefix $(obj),$(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-$(CONFIG_PWM_TEGRA) += pwm.o +obj-$(CONFIG_VIDEO_TEGRA) += display.o diff --git a/arch/arm/cpu/armv7/tegra30/Makefile b/arch/arm/cpu/armv7/tegra30/Makefile index 04adb5299..518d6d1b3 100644 --- a/arch/arm/cpu/armv7/tegra30/Makefile +++ b/arch/arm/cpu/armv7/tegra30/Makefile @@ -17,24 +17,4 @@  # along with this program.  If not, see <http://www.gnu.org/licenses/>.  # -include $(TOPDIR)/config.mk - -LIB	= $(obj)lib$(SOC).o - -COBJS	:= $(COBJS-y) -SRCS	:= $(COBJS:.o=.c) -OBJS	:= $(addprefix $(obj),$(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- := diff --git a/arch/arm/cpu/armv7/u8500/Makefile b/arch/arm/cpu/armv7/u8500/Makefile index 3d7a59200..fad9d4ae3 100644 --- a/arch/arm/cpu/armv7/u8500/Makefile +++ b/arch/arm/cpu/armv7/u8500/Makefile @@ -5,26 +5,5 @@  # SPDX-License-Identifier:	GPL-2.0+  # -include $(TOPDIR)/config.mk - -LIB	= $(obj)lib$(SOC).o - -COBJS	= timer.o clock.o prcmu.o cpu.o -SOBJS	= lowlevel.o - -SRCS	:= $(SOBJS:.o=.S) $(COBJS:.o=.c) -OBJS	:= $(addprefix $(obj),$(COBJS) $(SOBJS)) - -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	:= timer.o clock.o prcmu.o cpu.o +obj-y	+= lowlevel.o diff --git a/arch/arm/cpu/armv7/vf610/Makefile b/arch/arm/cpu/armv7/vf610/Makefile index 7d3c454d5..68cb756d6 100644 --- a/arch/arm/cpu/armv7/vf610/Makefile +++ b/arch/arm/cpu/armv7/vf610/Makefile @@ -4,26 +4,5 @@  # SPDX-License-Identifier:	GPL-2.0+  # -include $(TOPDIR)/config.mk - -LIB	= $(obj)lib$(SOC).o - -COBJS	+= generic.o -COBJS	+= timer.o - -SRCS	:= $(COBJS:.o=.c) -OBJS	:= $(addprefix $(obj),$(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	+= timer.o diff --git a/arch/arm/cpu/armv7/zynq/Makefile b/arch/arm/cpu/armv7/zynq/Makefile index de6b08157..d382d49eb 100644 --- a/arch/arm/cpu/armv7/zynq/Makefile +++ b/arch/arm/cpu/armv7/zynq/Makefile @@ -8,30 +8,7 @@  # SPDX-License-Identifier:	GPL-2.0+  # -include $(TOPDIR)/config.mk - -LIB	= $(obj)lib$(SOC).o - -COBJS-y	:= timer.o -COBJS-y	+= cpu.o -COBJS-y	+= ddrc.o -COBJS-y	+= slcr.o - -COBJS	:= $(COBJS-y) - -SRCS	:= $(COBJS:.o=.c) -OBJS	:= $(addprefix $(obj),$(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	:= timer.o +obj-y	+= cpu.o +obj-y	+= ddrc.o +obj-y	+= slcr.o |