diff options
Diffstat (limited to 'nuttx/arch/sh/src')
| -rw-r--r-- | nuttx/arch/sh/src/Makefile | 2 | ||||
| -rw-r--r-- | nuttx/arch/sh/src/sh1/sh1_head.S | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/nuttx/arch/sh/src/Makefile b/nuttx/arch/sh/src/Makefile index d0aca52fe..5c1e91a62 100644 --- a/nuttx/arch/sh/src/Makefile +++ b/nuttx/arch/sh/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/sh/src/sh1/sh1_head.S b/nuttx/arch/sh/src/sh1/sh1_head.S index 441cfdd80..15a82fcda 100644 --- a/nuttx/arch/sh/src/sh1/sh1_head.S +++ b/nuttx/arch/sh/src/sh1/sh1_head.S @@ -1,7 +1,7 @@ /***************************************************************************** * arch/sh/src/sh1/sh1_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 @@ -78,7 +78,7 @@ .globl _ebss /* End of BSS */ .globl _svect /* Start of the new vector location */ -#ifdef CONFIG_BOOT_FROM_FLASH +#ifdef CONFIG_BOOT_RUNFROMFLASH .globl _eronly /* Where .data defaults are stored in FLASH */ .global _sdata /* Start of .data in RAM */ .globl _edata /* End of .data in RAM */ @@ -388,7 +388,7 @@ __start0: /* Initialize data segement */ -#ifdef CONFIG_BOOT_FROM_FLASH +#ifdef CONFIG_BOOT_RUNFROMFLASH mov.l .Lsdata, r0 /* R0: Start of .data segment */ mov.l .Ledata, r1 /* R1: End+1 of .data segment */ mov.l .Leronly, r2 /* R2: Start of FLASH .data segment copy */ @@ -469,7 +469,7 @@ __start0: nop .align 2 -#ifdef CONFIG_BOOT_FROM_FLASH +#ifdef CONFIG_BOOT_RUNFROMFLASH .Leronly: .long _eronly .Lsdata: |