From 1e59a2fda076e7b19a5d51142f240dce800e8848 Mon Sep 17 00:00:00 2001
From: patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>
Date: Wed, 20 Feb 2008 12:55:07 +0000
Subject: [PATCH] Incorporate patch 1897630

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@714 42af7a65-404d-4744-a932-0658087f49c3
---
 arch/z80/src/Makefile.sdcc    | 5 +++++
 arch/z80/src/z80/z80_head.asm | 4 ++++
 2 files changed, 9 insertions(+)

diff --git a/arch/z80/src/Makefile.sdcc b/arch/z80/src/Makefile.sdcc
index 895ecc4bae..ac38c24601 100644
--- a/arch/z80/src/Makefile.sdcc
+++ b/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/arch/z80/src/z80/z80_head.asm b/arch/z80/src/z80/z80_head.asm
index eb246b588e..62f2496a49 100644
--- a/arch/z80/src/z80/z80_head.asm
+++ b/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
 ;**************************************************************************