diff --git a/arch/dm320/src/Makefile b/arch/dm320/src/Makefile index 6ee4d4a9c7..702d579516 100644 --- a/arch/dm320/src/Makefile +++ b/arch/dm320/src/Makefile @@ -63,6 +63,8 @@ LINKLIBS = LDPATHES = $(addprefix -L$(TOPDIR)/,$(dir $(LINKLIBS))) LDLIBS = $(patsubst lib%,-l%,$(basename $(notdir $(LINKLIBS)))) +BOARDDIR = $(TOPDIR)/arch/$(CONFIG_ARCH)/src/board + LIBGCC = ${shell $(CC) -print-libgcc-file-name} all: up_head.o libarch$(LIBEXT) @@ -79,9 +81,12 @@ libarch$(LIBEXT): $(OBJS) { echo "$(AR) $@ $obj FAILED!" ; exit 1 ; } ; \ done ; ) -nuttx: $(LINKOBJS) - $(LD) --entry=__start $(LDFLAGS) $(LDPATHES) -o $(TOPDIR)/$@ $(LINKOBJS) \ - --start-group $(LDLIBS) --end-group $(EXTRA_LIBS) $(LIBGCC) +board/libboard$(LIBEXT): + $(MAKE) -C board TOPDIR=$(TOPDIR) libboard$(LIBEXT) + +nuttx: $(LINKOBJS) board/libboard$(LIBEXT) + $(LD) --entry=__start $(LDFLAGS) $(LDPATHES) -L$(BOARDDIR) -o $(TOPDIR)/$@ $(LINKOBJS) \ + --start-group $(LDLIBS) -lboard --end-group $(EXTRA_LIBS) $(LIBGCC) @$(NM) $(TOPDIR)/$@ | \ grep -v '\(compiled\)\|\(\.o$$\)\|\( [aUw] \)\|\(\.\.ng$$\)\|\(LASH[RL]DI\)' | \ sort > $(TOPDIR)/System.map @@ -98,15 +103,24 @@ ifeq ($(CONFIG_RRLOAD_BINARY),y) endif .depend: Makefile $(SRCS) + @if [ -e board/Makefile ]; then \ + $(MAKE) -C board TOPDIR=$(TOPDIR) depend ; \ + if $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep touch $@ depend: .depend clean: + @if [ -e board/Makefile ]; then \ + $(MAKE) -C board TOPDIR=$(TOPDIR) clean ; \ + fi rm -f libarch$(LIBEXT) *.o *~ distclean: clean + @if [ -e board/Makefile ]; then \ + $(MAKE) -C board TOPDIR=$(TOPDIR) distclean ; \ + fi rm -f Make.dep .depend -include Make.dep diff --git a/arch/dm320/src/up_head.S b/arch/dm320/src/up_head.S index a00e615c3b..3875410795 100644 --- a/arch/dm320/src/up_head.S +++ b/arch/dm320/src/up_head.S @@ -277,6 +277,11 @@ __start: bl up_boot + /* Set up the LEDs */ + +#ifdef CONFIG_ARCH_LEDS + bl up_ledinit +#endif /* Perform early serial initialization */ #ifdef CONFIG_DEV_CONSOLE diff --git a/arch/dm320/src/up_internal.h b/arch/dm320/src/up_internal.h index 2c34616978..6360d552bc 100644 --- a/arch/dm320/src/up_internal.h +++ b/arch/dm320/src/up_internal.h @@ -144,6 +144,18 @@ extern void up_timerinit(void); extern void up_maskack_irq(int irq); +/* Defined in board/up_leds.c */ + +#ifdef CONFIG_ARCH_LEDS +extern void up_ledinit(void); +extern void up_ledon(int led); +extern void up_ledoff(int led); +#else +# define up_ledinit() +# define up_ledon(led) +# define up_ledoff(led) +#endif + #endif /* __ASSEMBLY__ */ #endif /* __UP_INTERNAL_H */