Cleanup STX GP3SSA code; fix build and compile problems.

diff --git a/board/stxssa/Makefile b/board/stxssa/Makefile
index 5d8ea34946b8882501b96f8e9079c39dd1aa17e1..344ecdfd79717eef7b129797c4e534e6241b0167 100644 (file)
--- a/board/stxssa/Makefile
+++ b/board/stxssa/Makefile
@@ -23,14 +23,17 @@
 
 include $(TOPDIR)/config.mk
 
-LIB    = lib$(BOARD).a
+LIB    = $(obj)lib$(BOARD).a
 
-OBJS   := $(BOARD).o
+COBJS  := $(BOARD).o
 SOBJS  := init.o
-#SOBJS :=
 
-$(LIB):        $(OBJS) $(SOBJS)
-       $(AR) crv $@ $(OBJS)
+SRCS   := $(SOBJS:.o=.S) $(COBJS:.o=.c)
+OBJS   := $(addprefix $(obj),$(COBJS))
+SOBJS  := $(addprefix $(obj),$(SOBJS))
+
+$(LIB):        $(obj).depend $(OBJS) $(SOBJS)
+       $(AR) $(ARFLAGS) $@ $(OBJS)
 
 clean:
        rm -f $(OBJS) $(SOBJS)
@@ -40,9 +43,9 @@ distclean:    clean
 
 #########################################################################
 
-.depend:       Makefile $(SOBJS:.o=.S) $(OBJS:.o=.c)
-               $(CC) -M $(CPPFLAGS) $(SOBJS:.o=.S) $(OBJS:.o=.c) > $@
+# defines $(obj).depend target
+include $(SRCTREE)/rules.mk
 
--include .depend
+sinclude $(obj).depend
 
 #########################################################################

diff --git a/board/stxssa/stxssa.c b/board/stxssa/stxssa.c
index 87d3d6f9949fa7f284b1d5bdd72de0e61192adee..0fb233d818a086cfa872ec882c500dd4397aba5e 100644 (file)
--- a/board/stxssa/stxssa.c
+++ b/board/stxssa/stxssa.c
@@ -203,8 +203,9 @@ void
 reset_phy(void)
 {
        volatile uint *blatch;
+#if 0
        int     i;
-
+#endif
        blatch = (volatile uint *)CFG_LBC_CFGLATCH_BASE;
 
        /* reset Giga bit Ethernet port if needed here */
@@ -298,10 +299,10 @@ initdram (int board_type)
 {
        long dram_size = 0;
        extern long spd_sdram (void);
-       volatile immap_t *immap = (immap_t *)CFG_IMMR;
 
 #if defined(CONFIG_DDR_DLL)
        {
+               volatile immap_t *immap = (immap_t *)CFG_IMMR;
                volatile ccsr_gur_t *gur= &immap->im_gur;
                uint temp_ddrdll = 0;