Skip to content

P
PPSi
Commit 8cf15d41 authored by Aurelio Colosimo's avatar Aurelio Colosimo
Browse files
Options

ppsi now links wrpc-sw hw drivers

parent a34f8c5d
Hide whitespace changes
Inline Side-by-side
Showing with 21 additions and 13 deletions
arch-spec/Makefile
View file @ 8cf15d41
......@@ -6,6 +6,13 @@ CFLAGS += -ffreestanding -Os \
ARCH_LDFLAGS = -nostdlib -static -T $(ARCH).lds
# Root of wrpc-sw project
WRPCSW_ROOT = ..
# FIXME ptp-noposix root; used till everything common would not be put in
# wrpc-sw
PTPNOPOSIX_ROOT = $(WRPCSW_ROOT)/ptp-noposix
# All files are under A (short for ARCH): I'm lazy
A := arch-$(ARCH)
......@@ -19,17 +26,19 @@ OBJ-libarch := $A/spec-startup.o \
$A/spec-spll.o \
$A/spec-calibration.o \
$A/spec-halexp.o \
$A/dev/uart.o \
$A/dev/syscon.o \
$A/dev/ep_pfilter.o \
$A/dev/endpoint.o \
$A/dev/pps_gen.o \
$A/dev/minic.o \
$A/dev/softpll_ng.o \
$A/dev/irq.o \
$A/dev/sdb.o \
lib/div64.o
OBJ-specdev := $(WRPCSW_ROOT)/dev/uart.o \
$(WRPCSW_ROOT)/dev/syscon.o \
$(WRPCSW_ROOT)/dev/ep_pfilter.o \
$(WRPCSW_ROOT)/dev/endpoint.o \
$(WRPCSW_ROOT)/dev/pps_gen.o \
$(WRPCSW_ROOT)/dev/minic.o \
$(WRPCSW_ROOT)/arch/lm32/irq.o \
$(WRPCSW_ROOT)/dev/sdb.o \
$(PTPNOPOSIX_ROOT)/softpll/softpll_ng.o \
$(WRPCSW_ROOT)/lib/mprintf.o
$(LIBARCH): $(OBJ-libarch)
$(AR) r $@ $^
......@@ -39,7 +48,7 @@ all: $(TARGET) $(TARGET).bin
# were not selected yet (e.g., pp_open_instance() ).
$(TARGET): $(TARGET).o $A/crt0.o $(LIBARCH)
$(CC) -Wl,-Map,$(TARGET).map2 $(ARCH_LDFLAGS) -o $@ $A/crt0.o \
$(TARGET).o -L$A -larch -L$D -lstd -L$W -lwr
$(TARGET).o $(OBJ-specdev) -L$A -larch -L$D -lstd -L$W -lwr
$(TARGET).bin: $(TARGET)
$(OBJCOPY) -O binary $^ $@
arch-spec/spec-io.c
View file @ 8cf15d41
......@@ -10,7 +10,7 @@ const Integer32 PP_ADJ_FREQ_MAX = 512000; //GGDD value ?
void pp_puts(const char *s)
{
spec_puts(s);
puts(s);
}
int pp_strnlen(const char *s, int maxlen)
......
arch-spec/spec-startup.c
View file @ 8cf15d41
......@@ -24,7 +24,7 @@ void ppsi_main(void)
{
struct pp_instance *ppi = &ppi_static; /* no malloc, one instance */
sdb_find_devices();
spec_uart_init();
uart_init();
pp_puts("Spec: starting. Compiled on " __DATE__ "\n");
......
arch-spec/spec.h
View file @ 8cf15d41
......@@ -84,7 +84,6 @@ extern void spec_udelay(int usecs);
extern int spec_errno;
/* Dev stuff */
extern void spec_uart_init(void);
extern void spec_putc(int c);
extern void spec_puts(const char *s);
extern int spec_testc(void);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment