diff options
Diffstat (limited to 'nuttx/arch/arm/src')
| -rw-r--r-- | nuttx/arch/arm/src/Makefile | 2 | ||||
| -rw-r--r-- | nuttx/arch/arm/src/common/up_nommuhead.S | 4 | ||||
| -rw-r--r-- | nuttx/arch/arm/src/lpc214x/lpc214x_head.S | 4 | ||||
| -rw-r--r-- | nuttx/arch/arm/src/str71x/str71x_head.S | 6 |
4 files changed, 8 insertions, 8 deletions
diff --git a/nuttx/arch/arm/src/Makefile b/nuttx/arch/arm/src/Makefile index 098b69ed1..a320cdb31 100644 --- a/nuttx/arch/arm/src/Makefile +++ b/nuttx/arch/arm/src/Makefile @@ -83,7 +83,7 @@ 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) -ifeq ($(CONFIG_BOOT_FROM_FLASH),y) +ifeq ($(CONFIG_BOOT_RUNFROMFLASH),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)/$@ diff --git a/nuttx/arch/arm/src/common/up_nommuhead.S b/nuttx/arch/arm/src/common/up_nommuhead.S index 953a8ffc2..36638c6ae 100644 --- a/nuttx/arch/arm/src/common/up_nommuhead.S +++ b/nuttx/arch/arm/src/common/up_nommuhead.S @@ -93,7 +93,7 @@ __start: /* Copy system .data sections to new home in RAM. */ -#ifdef CONFIG_BOOT_FROM_FLASH +#ifdef CONFIG_BOOT_RUNFROMFLASH adr r3, LC2 ldmia r3, {r0, r1, r2} @@ -141,7 +141,7 @@ LC0: .long _sbss .long _ebss .long _ebss+CONFIG_IDLETHREAD_STACKSIZE-4 -#ifdef CONFIG_BOOT_FROM_FLASH +#ifdef CONFIG_BOOT_RUNFROMFLASH LC2: .long _eronly /* Where .data defaults are stored in FLASH */ .long _sdata /* Where .data needs to reside in SDRAM */ .long _edata diff --git a/nuttx/arch/arm/src/lpc214x/lpc214x_head.S b/nuttx/arch/arm/src/lpc214x/lpc214x_head.S index 140f33e74..b1fd603f7 100644 --- a/nuttx/arch/arm/src/lpc214x/lpc214x_head.S +++ b/nuttx/arch/arm/src/lpc214x/lpc214x_head.S @@ -557,7 +557,7 @@ __start: /* Copy system .data sections to new home in RAM. */ -#ifdef CONFIG_BOOT_FROM_FLASH +#ifdef CONFIG_BOOT_RUNFROMFLASH adr r3, LC2 ldmia r3, {r0, r1, r2} @@ -601,7 +601,7 @@ LC0: .long _sbss .long _ebss .long _ebss+CONFIG_IDLETHREAD_STACKSIZE-4 -#ifdef CONFIG_BOOT_FROM_FLASH +#ifdef CONFIG_BOOT_RUNFROMFLASH LC2: .long _eronly /* Where .data defaults are stored in FLASH */ .long _sdata /* Where .data needs to reside in SDRAM */ .long _edata diff --git a/nuttx/arch/arm/src/str71x/str71x_head.S b/nuttx/arch/arm/src/str71x/str71x_head.S index 72c08abcf..22164f198 100644 --- a/nuttx/arch/arm/src/str71x/str71x_head.S +++ b/nuttx/arch/arm/src/str71x/str71x_head.S @@ -1,7 +1,7 @@ /***************************************************************************** * arch/arm/src/str71x/str71x_head.S * - * Copyright (C) 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -510,7 +510,7 @@ __flashstart: /* Copy system .data sections to new home in RAM. */ -#ifdef CONFIG_BOOT_FROM_FLASH +#ifdef CONFIG_BOOT_RUNFROMFLASH adr r3, LC2 ldmia r3, {r0, r1, r2} @@ -601,7 +601,7 @@ LC0: .long _sbss .long _ebss .long _ebss+CONFIG_IDLETHREAD_STACKSIZE-4 -#ifdef CONFIG_BOOT_FROM_FLASH +#ifdef CONFIG_BOOT_RUNFROMFLASH LC2: .long _eronly /* Where .data defaults are stored in FLASH */ .long _sdata /* Where .data needs to reside in SDRAM */ .long _edata |