diff options
author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2008-02-20 12:55:07 +0000 |
---|---|---|
committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2008-02-20 12:55:07 +0000 |
commit | 1b08b8648b5953487c22b1ac302e7808cdfb6e26 (patch) | |
tree | d6f5af4b94c1c5024cd0971ed9c2b2873f6c30e4 /nuttx/arch | |
parent | b646eb48cc56cac50ee19e2b7c9304a3ed6809c4 (diff) | |
download | px4-nuttx-1b08b8648b5953487c22b1ac302e7808cdfb6e26.tar.gz px4-nuttx-1b08b8648b5953487c22b1ac302e7808cdfb6e26.tar.bz2 px4-nuttx-1b08b8648b5953487c22b1ac302e7808cdfb6e26.zip |
Incorporate patch 1897630
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@714 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/arch')
-rw-r--r-- | nuttx/arch/z80/src/Makefile.sdcc | 5 | ||||
-rw-r--r-- | nuttx/arch/z80/src/z80/z80_head.asm | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/nuttx/arch/z80/src/Makefile.sdcc b/nuttx/arch/z80/src/Makefile.sdcc index 895ecc4ba..ac38c2460 100644 --- a/nuttx/arch/z80/src/Makefile.sdcc +++ b/nuttx/arch/z80/src/Makefile.sdcc @@ -128,6 +128,11 @@ endif @echo " CONFIG_STACK_BASE == (CONFIG_STACK_END - $(CONFIG_PROC_STACK_SIZE))" >> asm_mem.h @echo " CONFIG_HEAP1_END == (CONFIG_STACK_END - $(CONFIG_PROC_STACK_SIZE) - 1)" >> asm_mem.h @echo " CONFIG_HEAP1_BASE == $(HEAP_BASE)" >> asm_mem.h +ifeq ($(CONFIG_LINKER_ROM_AT_0000),y) + @echo " CONFIG_LINKER_ROM_AT_0000 == 1" >> asm_mem.h +else + @echo " CONFIG_LINKER_ROM_AT_0000 == 0" >> asm_mem.h +endif # Combine all objects in this directory into a library diff --git a/nuttx/arch/z80/src/z80/z80_head.asm b/nuttx/arch/z80/src/z80/z80_head.asm index eb246b588..62f2496a4 100644 --- a/nuttx/arch/z80/src/z80/z80_head.asm +++ b/nuttx/arch/z80/src/z80/z80_head.asm @@ -63,6 +63,9 @@ .globl _os_start ; OS entry point
.globl _up_doirq ; Interrupt decoding logic
+ +.if CONFIG_LINKER_ROM_AT_0000 +.else ;CONFIG_LINKER_ROM_AT_0000 ;**************************************************************************
; Reset entry point
;**************************************************************************
@@ -158,6 +161,7 @@ .org 0x0066
retn
+.endif ;CONFIG_LINKER_ROM_AT_0000 ;**************************************************************************
; System start logic
;**************************************************************************
|