diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2008-09-17 20:27:29 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2008-09-17 20:27:29 +0000 |
| commit | d7a9800e3ecdd8f6bce4b5ee83bfe91e4238b61e (patch) | |
| tree | 8f4195e59f0692c34653236e64f632d37dcfdb8d /nuttx/arch/arm | |
| parent | 2329a560c03845b21f525cf269106bae13b1039e (diff) | |
| download | px4-nuttx-d7a9800e3ecdd8f6bce4b5ee83bfe91e4238b61e.tar.gz px4-nuttx-d7a9800e3ecdd8f6bce4b5ee83bfe91e4238b61e.tar.bz2 px4-nuttx-d7a9800e3ecdd8f6bce4b5ee83bfe91e4238b61e.zip | |
LPC2148 oots partially into NuttX
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@924 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/arch/arm')
| -rw-r--r-- | nuttx/arch/arm/src/Makefile | 7 | ||||
| -rw-r--r-- | nuttx/arch/arm/src/lpc214x/lpc214x_head.S | 11 |
2 files changed, 10 insertions, 8 deletions
diff --git a/nuttx/arch/arm/src/Makefile b/nuttx/arch/arm/src/Makefile index 44c417409..098b69ed1 100644 --- a/nuttx/arch/arm/src/Makefile +++ b/nuttx/arch/arm/src/Makefile @@ -82,7 +82,12 @@ board/libboard$(LIBEXT): nuttx: $(HEAD_AOBJ) board/libboard$(LIBEXT) @echo "LD: nuttx" @$(LD) --entry=__start $(LDFLAGS) $(LDPATHES) -L$(BOARDDIR) -o $(TOPDIR)/$@ $(HEAD_AOBJ) \ - --start-group $(LDLIBS) -lboard --end-group $(EXTRA_LIBS) $(LIBGCC) + --start-group $(LDLIBS) -lboard --end-group $(EXTRA_LIBS) $(LIBGCC) +ifeq ($(CONFIG_BOOT_FROM_FLASH),y) + @export flashloc=`$(OBJDUMP) --all-headers $(TOPDIR)/$@ | grep _eronly | cut -d' ' -f1`; \ + $(OBJCOPY) --adjust-section-vma=.data=0x$$flashloc $(TOPDIR)/$@ $(TOPDIR)/$@.flashimage + @mv $(TOPDIR)/$@.flashimage $(TOPDIR)/$@ +endif @$(NM) $(TOPDIR)/$@ | \ grep -v '\(compiled\)\|\(\$(OBJEXT)$$\)\|\( [aUw] \)\|\(\.\.ng$$\)\|\(LASH[RL]DI\)' | \ sort > $(TOPDIR)/System.map diff --git a/nuttx/arch/arm/src/lpc214x/lpc214x_head.S b/nuttx/arch/arm/src/lpc214x/lpc214x_head.S index 15939a3ad..b3c2a9ee6 100644 --- a/nuttx/arch/arm/src/lpc214x/lpc214x_head.S +++ b/nuttx/arch/arm/src/lpc214x/lpc214x_head.S @@ -415,7 +415,7 @@ __start: /* Configure VPBDIV */ configvpbdiv r0, r1 - + /* Configure the PLL */ configpll r0, r1, r2, r3 @@ -471,12 +471,9 @@ __start: mov fp, #0 bl up_earlyserialinit -#ifdef CONFIG_DEBUG - mov r0, #'C' - bl up_putc - mov r0, #'\n' - bl up_putc -#endif + showprogress 'C' + showprogress '\n' + /* Initialize onboard LEDs */ #ifdef CONFIG_ARCH_LEDS |