ppc4xx: Fix problems in some ppc4xx board Makefiles

Some 4xx Makefiles didn't add $(SOBJ) to their board library. This was
no till now problem, since those boards included this object (init.o
most of the time) directly from their linker scripts. This patch clean
this up, so that all objects are now collected in the board library. This
is in preparation for the upcoming PPC4xx linker script consolidation.

Signed-off-by: Stefan Roese <sr@denx.de>

diff --git a/board/eric/Makefile b/board/eric/Makefile
index 81a455202a7c5f85edd665205aab7417544844c7..c2a68728093b67b8cbde49f6a9e369d1663f0e94 100644 (file)
--- a/board/eric/Makefile
+++ b/board/eric/Makefile
@@ -33,7 +33,7 @@ OBJS  := $(addprefix $(obj),$(COBJS))
 SOBJS  := $(addprefix $(obj),$(SOBJS))
 
 $(LIB):        $(OBJS) $(SOBJS)
-       $(AR) $(ARFLAGS) $@ $(OBJS)
+       $(AR) $(ARFLAGS) $@ $(OBJS) $(SOBJS)
 
 clean:
        rm -f $(SOBJS) $(OBJS)

diff --git a/board/jse/Makefile b/board/jse/Makefile
index 6be03ac541db12619d1761f267d6f0b26ff69ac5..fc71601e5c473807224b9691cb9ebf61e3b1969b 100644 (file)
--- a/board/jse/Makefile
+++ b/board/jse/Makefile
@@ -33,7 +33,7 @@ OBJS  := $(addprefix $(obj),$(COBJS))
 SOBJS  := $(addprefix $(obj),$(SOBJS))
 
 $(LIB):        $(OBJS) $(SOBJS)
-       $(AR) $(ARFLAGS) $@ $(OBJS)
+       $(AR) $(ARFLAGS) $@ $(OBJS) $(SOBJS)
 
 clean:
        rm -f $(SOBJS) $(OBJS)

diff --git a/board/ml2/Makefile b/board/ml2/Makefile
index 2a9366656f5da1b27275536b5c9f47c4bb32fd75..59644dba6a645eda7d19c517dc2b50e44680faac 100644 (file)
--- a/board/ml2/Makefile
+++ b/board/ml2/Makefile
@@ -33,7 +33,7 @@ OBJS  := $(addprefix $(obj),$(COBJS))
 SOBJS  := $(addprefix $(obj),$(SOBJS))
 
 $(LIB):        $(OBJS) $(SOBJS)
-       $(AR) $(ARFLAGS) $@ $(OBJS)
+       $(AR) $(ARFLAGS) $@ $(OBJS) $(SOBJS)
 
 clean:
        rm -f $(SOBJS) $(OBJS)

diff --git a/board/mpl/mip405/Makefile b/board/mpl/mip405/Makefile
index 53bf84658661ea5feaf5c01d0d89fc84e955acce..18a8d8656c808c75dda8400b1930824dcaa9fb52 100644 (file)
--- a/board/mpl/mip405/Makefile
+++ b/board/mpl/mip405/Makefile
@@ -38,7 +38,7 @@ OBJS  := $(addprefix $(obj),$(COBJS))
 SOBJS  := $(addprefix $(obj),$(SOBJS))
 
 $(LIB):        $(OBJS) $(SOBJS)
-       $(AR) $(ARFLAGS) $@ $(OBJS)
+       $(AR) $(ARFLAGS) $@ $(OBJS) $(SOBJS)
 
 clean:
        rm -f $(SOBJS) $(OBJS)

diff --git a/board/mpl/pip405/Makefile b/board/mpl/pip405/Makefile
index 590c7da5bb390f43eaaa424d5a9bc727f74fb405..774b59f84e5fed339c8cc7d9388443126f0bf0c9 100644 (file)
--- a/board/mpl/pip405/Makefile
+++ b/board/mpl/pip405/Makefile
@@ -41,7 +41,7 @@ OBJS  := $(addprefix $(obj),$(COBJS))
 SOBJS  := $(addprefix $(obj),$(SOBJS))
 
 $(LIB):        $(OBJS) $(SOBJS)
-       $(AR) $(ARFLAGS) $@ $(OBJS)
+       $(AR) $(ARFLAGS) $@ $(OBJS) $(SOBJS)
 
 clean:
        rm -f $(SOBJS) $(OBJS)