post/Makefile: make sure to use the correct flags

[u-boot] / post / Makefile

diff --git a/post/Makefile b/post/Makefile
index e0ce902133d73e1e035648339b00d93555452f59..c737729f9e0c366b19907733c35a73fb268e1824 100644 (file)
--- a/post/Makefile
+++ b/post/Makefile
@@ -1,5 +1,5 @@
 #
-# (C) Copyright 2002
+# (C) Copyright 2002-2006
 # Wolfgang Denk, DENX Software Engineering, wd@denx.de.
 #
 # See file CREDITS for list of people who contributed to this
@@ -21,13 +21,51 @@
 # MA 02111-1307 USA
 #
 
+include $(TOPDIR)/config.mk
+include $(TOPDIR)/include/autoconf.mk
 
-SUBDIRS = cpu
+LIB                            = libpost.a
+GPLIB-$(CONFIG_HAS_POST)       += libgenpost.a
+COBJS-$(CONFIG_HAS_POST)       += post.o tests.o
 
-LIB    = libpost.a
+SPLIB-$(CONFIG_HAS_POST) = drivers/libpostdrivers.a
+SPLIB-$(CONFIG_HAS_POST) += $(shell if [ -d lib_$(ARCH) ]; then echo \
+                           "lib_$(ARCH)/libpost$(ARCH).a"; fi)
+SPLIB-$(CONFIG_HAS_POST) += $(shell if [ -d lib_$(ARCH)/fpu ]; then echo \
+                           "lib_$(ARCH)/fpu/libpost$(ARCH)fpu.a"; fi)
+SPLIB-$(CONFIG_HAS_POST) += $(shell if [ -d cpu/$(CPU) ]; then echo \
+                           "cpu/$(CPU)/libpost$(CPU).a"; fi)
+SPLIB-$(CONFIG_HAS_POST) += $(shell if [ -d board/$(BOARD) ]; then echo \
+                           "board/$(BOARD)/libpost$(BOARD).a"; fi)
 
-AOBJS  = cache_8xx.o
-COBJS  = post.o tests.o cpu.o rtc.o watchdog.o memory.o i2c.o cache.o sysmon.o
-COBJS  += uart.o ether.o usb.o spr.o
+GPLIB  := $(GPLIB-y)
+SPLIB  := $(SPLIB-y)
+COBJS  := $(COBJS-y)
+SRCS   := $(SOBJS:.o=.S) $(COBJS:.o=.c)
+OBJS   := $(addprefix $(obj),$(COBJS))
+LIB    := $(obj)$(LIB)
 
-include $(TOPDIR)/post/rules.mk
+all:   $(LIB)
+
+# generic POST library
+$(GPLIB): $(obj).depend $(OBJS)
+       $(AR) $(ARFLAGS) $@ $(OBJS)
+
+# specific POST libraries
+$(SPLIB): $(obj).depend
+       $(MAKE) -C $(dir $(subst $(obj),,$@))
+
+# the POST lib archive
+$(LIB): $(GPLIB) $(SPLIB)
+       (echo create $(LIB); for lib in $(GPLIB) $(SPLIB) ; \
+        do echo addlib $$lib; done; echo save) \
+       | $(AR) -M
+
+#########################################################################
+
+# defines $(obj).depend target
+include $(SRCTREE)/rules.mk
+
+sinclude $(obj).depend
+
+#########################################################################