Cleanup STX GP3SSA code; fix build and compile problems.

This commit is contained in:
Wolfgang Denk 2007-04-24 14:37:49 +02:00
parent 35171dc04e
commit 2c6fb199dc
2 changed files with 14 additions and 10 deletions

View File

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

View File

@ -203,8 +203,9 @@ void
reset_phy(void) reset_phy(void)
{ {
volatile uint *blatch; volatile uint *blatch;
#if 0
int i; int i;
#endif
blatch = (volatile uint *)CFG_LBC_CFGLATCH_BASE; blatch = (volatile uint *)CFG_LBC_CFGLATCH_BASE;
/* reset Giga bit Ethernet port if needed here */ /* reset Giga bit Ethernet port if needed here */
@ -298,10 +299,10 @@ initdram (int board_type)
{ {
long dram_size = 0; long dram_size = 0;
extern long spd_sdram (void); extern long spd_sdram (void);
volatile immap_t *immap = (immap_t *)CFG_IMMR;
#if defined(CONFIG_DDR_DLL) #if defined(CONFIG_DDR_DLL)
{ {
volatile immap_t *immap = (immap_t *)CFG_IMMR;
volatile ccsr_gur_t *gur= &immap->im_gur; volatile ccsr_gur_t *gur= &immap->im_gur;
uint temp_ddrdll = 0; uint temp_ddrdll = 0;