From a67cefc353f1f3ecb869bd04d4a951356fbe55da Mon Sep 17 00:00:00 2001 From: Masahiro Yamada Date: Mon, 21 Oct 2013 11:53:39 +0900 Subject: [PATCH] post: convert makefiles to Kbuild style This commit also deletes post/rules.mk, which in not necessary any more. Signed-off-by: Masahiro Yamada --- post/Makefile | 65 +++++++---------------------------- post/board/lwmon/Makefile | 7 ++-- post/board/lwmon5/Makefile | 7 ++-- post/board/netta/Makefile | 7 ++-- post/board/pdm360ng/Makefile | 7 ++-- post/cpu/mpc83xx/Makefile | 8 ++--- post/cpu/mpc8xx/Makefile | 9 ++--- post/cpu/ppc4xx/Makefile | 23 ++++++------- post/drivers/Makefile | 7 ++-- post/lib_powerpc/Makefile | 13 ++++--- post/lib_powerpc/fpu/Makefile | 24 ++++++------- post/rules.mk | 30 ---------------- 12 files changed, 54 insertions(+), 153 deletions(-) delete mode 100644 post/rules.mk diff --git a/post/Makefile b/post/Makefile index 0ecae5bd64..143924482f 100644 --- a/post/Makefile +++ b/post/Makefile @@ -5,55 +5,16 @@ # SPDX-License-Identifier: GPL-2.0+ # -include $(TOPDIR)/config.mk -include $(OBJTREE)/include/autoconf.mk - -LIB = libpost.o -GPLIB-$(CONFIG_HAS_POST) += libgenpost.o -COBJS-$(CONFIG_HAS_POST) += post.o -COBJS-$(CONFIG_POST_STD_LIST) += tests.o - -SPLIB-$(CONFIG_HAS_POST) = drivers/libpostdrivers.o -SPLIB-$(CONFIG_HAS_POST) += $(shell if [ -d lib_$(ARCH) ]; then echo \ - "lib_$(ARCH)/libpost$(ARCH).o"; fi) -SPLIB-$(CONFIG_HAS_POST) += $(shell if [ -d lib_$(ARCH)/fpu ]; then echo \ - "lib_$(ARCH)/fpu/libpost$(ARCH)fpu.o"; fi) -SPLIB-$(CONFIG_HAS_POST) += $(shell if [ -d cpu/$(CPU) ]; then echo \ - "cpu/$(CPU)/libpost$(CPU).o"; fi) -SPLIB-$(CONFIG_HAS_POST) += $(shell if [ -d board/$(BOARD) ]; then echo \ - "board/$(BOARD)/libpost$(BOARD).o"; fi) - -GPLIB := $(addprefix $(obj),$(GPLIB-y)) -SPLIB := $(addprefix $(obj),$(SPLIB-y)) -COBJS := $(COBJS-y) -SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) -OBJS := $(addprefix $(obj),$(COBJS)) -LIB := $(obj)$(LIB) - -all: $(LIB) - -postdeps: - @for lib in $(SPLIB-y) ; do \ - $(MAKE) -C `dirname $$lib` all ; \ - done - -# generic POST library -$(GPLIB): $(obj).depend $(OBJS) - $(call cmd_link_o_target, $(OBJS)) - -# specific POST libraries -$(SPLIB): $(obj).depend postdeps - $(MAKE) -C $(dir $(subst $(obj),,$@)) - -# the POST lib archive -$(LIB): $(GPLIB) $(SPLIB) - $(call cmd_link_o_target, $^) - -######################################################################### - -# defines $(obj).depend target -include $(SRCTREE)/rules.mk - -sinclude $(obj).depend - -######################################################################### +obj-$(CONFIG_HAS_POST) += post.o +obj-$(CONFIG_POST_STD_LIST) += tests.o + +obj-$(CONFIG_HAS_POST) += drivers/ +ifeq ($(ARCH),powerpc) +obj-$(CONFIG_HAS_POST) += lib_powerpc/ +endif +ifneq ($(filter mpc83xx mpc8xx ppc4xx,$(CPU)),) +obj-$(CONFIG_HAS_POST) += cpu/$(CPU)/ +endif +ifneq ($(filter lwmon lwmon5 netta pdm360ng,$(BOARD)),) +obj-$(CONFIG_HAS_POST) += board/$(BOARD)/ +endif diff --git a/post/board/lwmon/Makefile b/post/board/lwmon/Makefile index d38498bc47..1ac7aa511d 100644 --- a/post/board/lwmon/Makefile +++ b/post/board/lwmon/Makefile @@ -4,10 +4,7 @@ # # SPDX-License-Identifier: GPL-2.0+ # -include $(OBJTREE)/include/autoconf.mk -LIB = libpostlwmon.o +CPPFLAGS += -I$(TOPDIR) -COBJS-$(CONFIG_HAS_POST) += sysmon.o - -include $(TOPDIR)/post/rules.mk +obj-$(CONFIG_HAS_POST) += sysmon.o diff --git a/post/board/lwmon5/Makefile b/post/board/lwmon5/Makefile index b410dbb399..d8b195289e 100644 --- a/post/board/lwmon5/Makefile +++ b/post/board/lwmon5/Makefile @@ -4,10 +4,7 @@ # Developed for DENX Software Engineering GmbH # # SPDX-License-Identifier: GPL-2.0+ -include $(OBJTREE)/include/autoconf.mk -LIB = libpostlwmon5.o +CPPFLAGS += -I$(TOPDIR) -COBJS-$(CONFIG_HAS_POST) += sysmon.o watchdog.o dspic.o fpga.o dsp.o gdc.o - -include $(TOPDIR)/post/rules.mk +obj-$(CONFIG_HAS_POST) += sysmon.o watchdog.o dspic.o fpga.o dsp.o gdc.o diff --git a/post/board/netta/Makefile b/post/board/netta/Makefile index 2d73f55f25..cd27a5ce34 100644 --- a/post/board/netta/Makefile +++ b/post/board/netta/Makefile @@ -4,10 +4,7 @@ # # SPDX-License-Identifier: GPL-2.0+ # -include $(OBJTREE)/include/autoconf.mk -LIB = libpostnetta.o +CPPFLAGS += -I$(TOPDIR) -COBJS-$(CONFIG_HAS_POST) += codec.o dsp.o - -include $(TOPDIR)/post/rules.mk +obj-$(CONFIG_HAS_POST) += codec.o dsp.o diff --git a/post/board/pdm360ng/Makefile b/post/board/pdm360ng/Makefile index cb03e5896d..3f748892a7 100644 --- a/post/board/pdm360ng/Makefile +++ b/post/board/pdm360ng/Makefile @@ -4,10 +4,7 @@ # # SPDX-License-Identifier: GPL-2.0+ # -include $(OBJTREE)/include/autoconf.mk -LIB = libpostpdm360ng.o +CPPFLAGS += -I$(TOPDIR) -COBJS-$(CONFIG_HAS_POST) += coproc_com.o - -include $(TOPDIR)/post/rules.mk +obj-$(CONFIG_HAS_POST) += coproc_com.o diff --git a/post/cpu/mpc83xx/Makefile b/post/cpu/mpc83xx/Makefile index 6ac56dc2e8..0643d01a7b 100644 --- a/post/cpu/mpc83xx/Makefile +++ b/post/cpu/mpc83xx/Makefile @@ -4,11 +4,7 @@ # # SPDX-License-Identifier: GPL-2.0+ # -include $(OBJTREE)/include/autoconf.mk -LIB = libpostmpc83xx.o +CPPFLAGS += -I$(TOPDIR) -AOBJS-$(CONFIG_HAS_POST) += -COBJS-$(CONFIG_HAS_POST) += ecc.o - -include $(TOPDIR)/post/rules.mk +obj-$(CONFIG_HAS_POST) += ecc.o diff --git a/post/cpu/mpc8xx/Makefile b/post/cpu/mpc8xx/Makefile index efde1fb3dc..7a2930a797 100644 --- a/post/cpu/mpc8xx/Makefile +++ b/post/cpu/mpc8xx/Makefile @@ -4,11 +4,8 @@ # # SPDX-License-Identifier: GPL-2.0+ # -include $(OBJTREE)/include/autoconf.mk -LIB = libpostmpc8xx.o +CPPFLAGS += -I$(TOPDIR) -AOBJS-$(CONFIG_HAS_POST) += cache_8xx.o -COBJS-$(CONFIG_HAS_POST) += cache.o ether.o spr.o uart.o usb.o watchdog.o - -include $(TOPDIR)/post/rules.mk +obj-$(CONFIG_HAS_POST) += cache_8xx.o +obj-$(CONFIG_HAS_POST) += cache.o ether.o spr.o uart.o usb.o watchdog.o diff --git a/post/cpu/ppc4xx/Makefile b/post/cpu/ppc4xx/Makefile index 614cef03fc..b7435c8252 100644 --- a/post/cpu/ppc4xx/Makefile +++ b/post/cpu/ppc4xx/Makefile @@ -4,18 +4,15 @@ # # SPDX-License-Identifier: GPL-2.0+ # -include $(OBJTREE)/include/autoconf.mk -LIB = libpostppc4xx.o +CPPFLAGS += -I$(TOPDIR) -AOBJS-$(CONFIG_HAS_POST) += cache_4xx.o -COBJS-$(CONFIG_HAS_POST) += cache.o -COBJS-$(CONFIG_HAS_POST) += denali_ecc.o -COBJS-$(CONFIG_HAS_POST) += ether.o -COBJS-$(CONFIG_HAS_POST) += fpu.o -COBJS-$(CONFIG_HAS_POST) += ocm.o -COBJS-$(CONFIG_HAS_POST) += spr.o -COBJS-$(CONFIG_HAS_POST) += uart.o -COBJS-$(CONFIG_HAS_POST) += watchdog.o - -include $(TOPDIR)/post/rules.mk +obj-$(CONFIG_HAS_POST) += cache_4xx.o +obj-$(CONFIG_HAS_POST) += cache.o +obj-$(CONFIG_HAS_POST) += denali_ecc.o +obj-$(CONFIG_HAS_POST) += ether.o +obj-$(CONFIG_HAS_POST) += fpu.o +obj-$(CONFIG_HAS_POST) += ocm.o +obj-$(CONFIG_HAS_POST) += spr.o +obj-$(CONFIG_HAS_POST) += uart.o +obj-$(CONFIG_HAS_POST) += watchdog.o diff --git a/post/drivers/Makefile b/post/drivers/Makefile index 6720f85139..2f6844cca4 100644 --- a/post/drivers/Makefile +++ b/post/drivers/Makefile @@ -4,10 +4,7 @@ # # SPDX-License-Identifier: GPL-2.0+ # -include $(TOPDIR)/config.mk -LIB = libpostdrivers.o +CPPFLAGS += -I$(TOPDIR) -COBJS-$(CONFIG_HAS_POST) += flash.o i2c.o memory.o rtc.o - -include $(TOPDIR)/post/rules.mk +obj-$(CONFIG_HAS_POST) += flash.o i2c.o memory.o rtc.o diff --git a/post/lib_powerpc/Makefile b/post/lib_powerpc/Makefile index efa1fb2261..f19fea3e5f 100644 --- a/post/lib_powerpc/Makefile +++ b/post/lib_powerpc/Makefile @@ -4,13 +4,12 @@ # # SPDX-License-Identifier: GPL-2.0+ # -include $(TOPDIR)/config.mk -LIB = libpost$(ARCH).o +CPPFLAGS += -I$(TOPDIR) -AOBJS-$(CONFIG_HAS_POST) += asm.o -COBJS-$(CONFIG_HAS_POST) += cpu.o cmp.o cmpi.o two.o twox.o three.o threex.o -COBJS-$(CONFIG_HAS_POST) += threei.o andi.o srawi.o rlwnm.o rlwinm.o rlwimi.o -COBJS-$(CONFIG_HAS_POST) += store.o load.o cr.o b.o multi.o string.o complex.o +obj-$(CONFIG_HAS_POST) += asm.o +obj-$(CONFIG_HAS_POST) += cpu.o cmp.o cmpi.o two.o twox.o three.o threex.o +obj-$(CONFIG_HAS_POST) += threei.o andi.o srawi.o rlwnm.o rlwinm.o rlwimi.o +obj-$(CONFIG_HAS_POST) += store.o load.o cr.o b.o multi.o string.o complex.o -include $(TOPDIR)/post/rules.mk +obj-$(CONFIG_HAS_POST) += fpu/ diff --git a/post/lib_powerpc/fpu/Makefile b/post/lib_powerpc/fpu/Makefile index eff7e6b402..6aec96c023 100644 --- a/post/lib_powerpc/fpu/Makefile +++ b/post/lib_powerpc/fpu/Makefile @@ -4,22 +4,18 @@ # # SPDX-License-Identifier: GPL-2.0+ # -include $(TOPDIR)/config.mk -LIB = libpost$(ARCH)fpu.o +CPPFLAGS += -I$(TOPDIR) -COBJS-$(CONFIG_HAS_POST) += 20001122-1.o -COBJS-$(CONFIG_HAS_POST) += 20010114-2.o -COBJS-$(CONFIG_HAS_POST) += 20010226-1.o -COBJS-$(CONFIG_HAS_POST) += 980619-1.o -COBJS-$(CONFIG_HAS_POST) += acc1.o -COBJS-$(CONFIG_HAS_POST) += compare-fp-1.o -COBJS-$(CONFIG_HAS_POST) += fpu.o -COBJS-$(CONFIG_HAS_POST) += mul-subnormal-single-1.o - -COBJS-$(CONFIG_HAS_POST) += darwin-ldouble.o - -include $(TOPDIR)/post/rules.mk +obj-$(CONFIG_HAS_POST) += 20001122-1.o +obj-$(CONFIG_HAS_POST) += 20010114-2.o +obj-$(CONFIG_HAS_POST) += 20010226-1.o +obj-$(CONFIG_HAS_POST) += 980619-1.o +obj-$(CONFIG_HAS_POST) += acc1.o +obj-$(CONFIG_HAS_POST) += compare-fp-1.o +obj-$(CONFIG_HAS_POST) += fpu.o +obj-$(CONFIG_HAS_POST) += mul-subnormal-single-1.o +obj-$(CONFIG_HAS_POST) += darwin-ldouble.o CFLAGS := $(shell echo $(CFLAGS) | sed s/-msoft-float//) CFLAGS += -mhard-float -fkeep-inline-functions diff --git a/post/rules.mk b/post/rules.mk deleted file mode 100644 index b25ebbf1cb..0000000000 --- a/post/rules.mk +++ /dev/null @@ -1,30 +0,0 @@ -# -# (C) Copyright 2002-2006 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# SPDX-License-Identifier: GPL-2.0+ -# - -include $(TOPDIR)/config.mk - -COBJS := $(COBJS-y) -AOBJS := $(AOBJS-y) -SRCS := $(AOBJS:.o=.S) $(COBJS:.o=.c) -OBJS := $(addprefix $(obj),$(AOBJS) $(COBJS)) -LIB := $(obj)$(LIB) - -CPPFLAGS += -I$(TOPDIR) - -all: $(LIB) - -$(LIB): $(obj).depend $(OBJS) - $(call cmd_link_o_target, $(OBJS)) - -######################################################################### - -# defines $(obj).depend target -include $(SRCTREE)/rules.mk - -sinclude $(obj).depend - -######################################################################### -- 2.39.5