Browse Source

post: convert makefiles to Kbuild style

This commit also deletes post/rules.mk,
which in not necessary any more.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
imx_v2014.04_3.10.31_1.1.0_beta
Masahiro Yamada 7 years ago
committed by Tom Rini
parent
commit
a67cefc353
12 changed files with 54 additions and 153 deletions
  1. +13
    -52
      post/Makefile
  2. +2
    -5
      post/board/lwmon/Makefile
  3. +2
    -5
      post/board/lwmon5/Makefile
  4. +2
    -5
      post/board/netta/Makefile
  5. +2
    -5
      post/board/pdm360ng/Makefile
  6. +2
    -6
      post/cpu/mpc83xx/Makefile
  7. +3
    -6
      post/cpu/mpc8xx/Makefile
  8. +10
    -13
      post/cpu/ppc4xx/Makefile
  9. +2
    -5
      post/drivers/Makefile
  10. +6
    -7
      post/lib_powerpc/Makefile
  11. +10
    -14
      post/lib_powerpc/fpu/Makefile
  12. +0
    -30
      post/rules.mk

+ 13
- 52
post/Makefile View File

@ -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

+ 2
- 5
post/board/lwmon/Makefile View File

@ -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

+ 2
- 5
post/board/lwmon5/Makefile View File

@ -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

+ 2
- 5
post/board/netta/Makefile View File

@ -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

+ 2
- 5
post/board/pdm360ng/Makefile View File

@ -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

+ 2
- 6
post/cpu/mpc83xx/Makefile View File

@ -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

+ 3
- 6
post/cpu/mpc8xx/Makefile View File

@ -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

+ 10
- 13
post/cpu/ppc4xx/Makefile View File

@ -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

+ 2
- 5
post/drivers/Makefile View File

@ -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

+ 6
- 7
post/lib_powerpc/Makefile View File

@ -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/

+ 10
- 14
post/lib_powerpc/fpu/Makefile View File

@ -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


+ 0
- 30
post/rules.mk View File

@ -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
#########################################################################

Loading…
Cancel
Save