From 9e1c8aed04687e10008c418dc477ae5832dfe6f1 Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Thu, 11 Sep 2014 12:35:23 -0600
Subject: Trivial kernel build related fixes for consistency

---
 nuttx/arch/arm/src/armv7-a/arm_copyarmstate.c | 2 +-
 nuttx/arch/z80/src/z180/z180_mmu.c            | 7 +++++++
 nuttx/include/nuttx/arch.h                    | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

(limited to 'nuttx')

diff --git a/nuttx/arch/arm/src/armv7-a/arm_copyarmstate.c b/nuttx/arch/arm/src/armv7-a/arm_copyarmstate.c
index 0a9d8ca1b..20f1934ef 100644
--- a/nuttx/arch/arm/src/armv7-a/arm_copyarmstate.c
+++ b/nuttx/arch/arm/src/armv7-a/arm_copyarmstate.c
@@ -89,7 +89,7 @@ void up_copyarmstate(uint32_t *dest, uint32_t *src)
 
       up_savefpu(dest);
 
-      /* Then copy all of the ARM registers (mitting the floating point
+      /* Then copy all of the ARM registers (omitting the floating point
        * registers).  Indices: 0 through (ARM_CONTEXT_REGS-1).
        */
 
diff --git a/nuttx/arch/z80/src/z180/z180_mmu.c b/nuttx/arch/z80/src/z180/z180_mmu.c
index e63e18403..0f888e961 100644
--- a/nuttx/arch/z80/src/z180/z180_mmu.c
+++ b/nuttx/arch/z80/src/z180/z180_mmu.c
@@ -247,7 +247,12 @@ int up_addrenv_create(size_t textsize, size_t datasize, size_t heapsize,
 
   /* Convert the size from bytes to numbers of pages */
 
+#ifdef CONFIG_BUILD_KERNEL
   envsize = textsize + datasize + heapsize;
+#else
+  envsize = textsize + datasize;
+#endif
+
   npages  = PHYS_ALIGNUP(envsize);
   if (npages < 1)
     {
@@ -414,12 +419,14 @@ int up_addrenv_vdata(FAR group_addrenv_t *addrenv, uintptr_t textsize,
  *
  ****************************************************************************/
 
+#ifdef CONFIG_BUILD_KERNEL
 ssize_t up_addrenv_heapsize(FAR const group_addrenv_t *addrenv)
 {
   /* Not implemented */
 
   return (ssize_t)-ENOSYS;
 }
+#endif
 
 /****************************************************************************
  * Name: up_addrenv_select
diff --git a/nuttx/include/nuttx/arch.h b/nuttx/include/nuttx/arch.h
index 92deaacca..e577dc4b5 100644
--- a/nuttx/include/nuttx/arch.h
+++ b/nuttx/include/nuttx/arch.h
@@ -872,7 +872,7 @@ int up_addrenv_vdata(FAR group_addrenv_t *addrenv, uintptr_t textsize,
  *
  ****************************************************************************/
 
-#ifdef CONFIG_ARCH_ADDRENV
+#if defined(CONFIG_ARCH_ADDRENV) && defined(CONFIG_BUILD_KERNEL)
 ssize_t up_addrenv_heapsize(FAR const group_addrenv_t *addrenv);
 #endif
 
-- 
cgit v1.2.3