summaryrefslogtreecommitdiff
path: root/board
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2007-04-24 14:37:49 +0200
committerWolfgang Denk <wd@denx.de>2007-05-03 16:16:10 +0200
commit2c6fb199dc5756fc72f49d1f4de105e089049d65 (patch)
tree1a3501631ae1dddf4aec6173c7d6f043f67df474 /board
parent35171dc04e028ecacc23ad916a66295472555dbf (diff)
Cleanup STX GP3SSA code; fix build and compile problems.
Diffstat (limited to 'board')
-rw-r--r--board/stxssa/Makefile19
-rw-r--r--board/stxssa/stxssa.c5
2 files changed, 14 insertions, 10 deletions
diff --git a/board/stxssa/Makefile b/board/stxssa/Makefile
index 5d8ea34946b..344ecdfd797 100644
--- 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 87d3d6f9949..0fb233d818a 100644
--- 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;