summaryrefslogtreecommitdiff
path: root/board/siemens/CCM
diff options
context:
space:
mode:
Diffstat (limited to 'board/siemens/CCM')
-rw-r--r--board/siemens/CCM/Makefile13
-rw-r--r--board/siemens/CCM/ccm.c2
2 files changed, 11 insertions, 4 deletions
diff --git a/board/siemens/CCM/Makefile b/board/siemens/CCM/Makefile
index e053c7d..c5695f9 100644
--- a/board/siemens/CCM/Makefile
+++ b/board/siemens/CCM/Makefile
@@ -22,23 +22,30 @@
#
include $(TOPDIR)/config.mk
+
ifneq ($(OBJTREE),$(SRCTREE))
$(shell mkdir -p $(obj)../common)
-$(shell mkdir -p $(obj)../../tqm8xx)
+$(shell mkdir -p $(obj)../../tqc/tqm8xx)
endif
LIB = $(obj)lib$(BOARD).a
COBJS = ccm.o flash.o fpga_ccm.o ../common/fpga.o \
- ../../tqm8xx/load_sernum_ethaddr.o
+ ../../tqc/tqm8xx/load_sernum_ethaddr.o
SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
OBJS := $(addprefix $(obj),$(COBJS))
SOBJS := $(addprefix $(obj),$(SOBJS))
-$(LIB): $(obj).depend $(OBJS)
+$(LIB): $(OBJS)
$(AR) $(ARFLAGS) $@ $(OBJS)
+clean:
+ rm -f $(SOBJS) $(OBJS)
+
+distclean: clean
+ rm -f $(LIB) core *.bak $(obj).depend
+
#########################################################################
# defines $(obj).depend target
diff --git a/board/siemens/CCM/ccm.c b/board/siemens/CCM/ccm.c
index 5a32e45..d653763 100644
--- a/board/siemens/CCM/ccm.c
+++ b/board/siemens/CCM/ccm.c
@@ -155,7 +155,7 @@ static void init_leds (void)
/* ------------------------------------------------------------------------- */
-long int initdram (int board_type)
+phys_size_t initdram (int board_type)
{
volatile immap_t *immap = (immap_t *)CFG_IMMR;
volatile memctl8xx_t *memctl = &immap->im_memctl;