diff --git a/ChangeLog b/ChangeLog
index 73a100a34b2f7e944507f3f80c3ece532fa76e49..16813774db9731930da6e8ec6d3a2d4b9254ba2a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1977,3 +1977,8 @@
examples/nxlines.
* arch/graphics: Used apps/examples/nxlines to (finally) verify the NX
trapezoid drawing functions and (wide) line drawing functions.
+ * arch/rgmp and configs/rgmp. Yu Qiang has ported RGMP to the OMAP4430 (arm)
+ pandaboard and release the new RGMP 0.3 version. The main changes are: (1)
+ Separate configs/rgmp/x86 and configs/rgmp/arm configuration directory, and
+ (2) Extract architecture dependent code in arch/rgmp/include and
+ arch/rgmp/src into corresponding x86/ and arm/ directories.
diff --git a/arch/rgmp/include/arch.h b/arch/rgmp/include/arch.h
index 789c1d471931f1a3a58ec324c657f6bb6498ea23..c93397baa41bc9d3501aa5760534b2187192f501 100644
--- a/arch/rgmp/include/arch.h
+++ b/arch/rgmp/include/arch.h
@@ -40,10 +40,12 @@
#ifndef __RGMP_ARCH_ARCH_H
#define __RGMP_ARCH_ARCH_H
+#include <arch/subarch/arch.h>
+
#ifndef __ASSEMBLY__
#include <nuttx/sched.h>
-#include <rgmp/hpet.h>
+
struct up_wait {
struct up_wait *next;
@@ -57,16 +59,6 @@ void up_sigentry(void);
int up_register_bridge(char *name, int size);
int up_unregister_bridge(char *name);
-static inline void up_mdelay(uint32_t msec)
-{
- hpet_ndelay(msec*1000000);
-}
-
-static inline void up_udelay(uint32_t usec)
-{
- hpet_udelay(usec*1000);
-}
-
-#endif
+#endif /* !__ASSEMBLY__ */
#endif
diff --git a/arch/rgmp/include/arm/arch/subarch/arch.h b/arch/rgmp/include/arm/arch/subarch/arch.h
new file mode 100644
index 0000000000000000000000000000000000000000..8b92c6bfea3152c8a5eeb05e2defc70dae1d6295
--- /dev/null
+++ b/arch/rgmp/include/arm/arch/subarch/arch.h
@@ -0,0 +1,58 @@
+/****************************************************************************
+ * arch/rgmp/include/arm/arch/subarch/arch.h
+ *
+ * Copyright (C) 2011 Yu Qiang. All rights reserved.
+ * Author: Yu Qiang <yuq825@gmail.com>
+ *
+ * This file is a part of NuttX:
+ *
+ * Copyright (C) 2011 Gregory Nutt. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ * 3. Neither the name NuttX nor the names of its contributors may be
+ * used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ ****************************************************************************/
+
+#ifndef __RGMP_ARCH_SUBARCH_ARCH_H
+#define __RGMP_ARCH_SUBARCH_ARCH_H
+
+#ifndef __ASSEMBLY__
+
+
+static inline void up_mdelay(uint32_t msec)
+{
+
+}
+
+static inline void up_udelay(uint32_t usec)
+{
+
+}
+
+#endif /* !__ASSEMBLY__ */
+
+#endif
diff --git a/arch/rgmp/include/irq.h b/arch/rgmp/include/irq.h
index 7f8a06dbb5040bf8bdddfb82a2f479981ee8a6dc..00c977560924adc56e02c7cbe1725cddf656c327 100644
--- a/arch/rgmp/include/irq.h
+++ b/arch/rgmp/include/irq.h
@@ -44,9 +44,9 @@
#ifndef __ASSEMBLY__
-#include <rgmp/trap.h>
#include <rgmp/spinlock.h>
#include <arch/types.h>
+#include <rgmp/trap.h>
struct xcptcontext {
struct Trapframe *tf;
@@ -56,6 +56,9 @@ struct xcptcontext {
void *sigdeliver;
};
+void push_xcptcontext(struct xcptcontext *xcp);
+void pop_xcptcontext(struct xcptcontext *xcp);
+
extern int nest_irq;
static inline irqstate_t irqsave(void)
@@ -68,5 +71,6 @@ static inline void irqrestore(irqstate_t flags)
popcli(flags);
}
-#endif
+#endif /* !__ASSEMBLY__ */
+
#endif
diff --git a/arch/rgmp/include/stdint.h b/arch/rgmp/include/stdint.h
index 59dff2c8d50ce9f0086d4af03a54e739e5048062..7b244dd9f4467abb9ba53157d0981119a9d40b2e 100644
--- a/arch/rgmp/include/stdint.h
+++ b/arch/rgmp/include/stdint.h
@@ -207,29 +207,7 @@
* provided by their toolchain header files.
*/
-#ifdef CONFIG_ARCH_RGMP
#include <rgmp/types.h>
-#else
-typedef _int8_t int8_t;
-typedef _uint8_t uint8_t;
-
-typedef _int16_t int16_t;
-typedef _uint16_t uint16_t;
-
-#ifdef __INT24_DEFINED
-typedef _int24_t int24_t;
-typedef _uint24_t uint24_t;
-#endif
-
-typedef _int32_t int32_t;
-typedef _uint32_t uint32_t;
-
-#ifdef __INT64_DEFINED
-typedef _int64_t int64_t;
-typedef _uint64_t uint64_t;
-#endif
-
-#endif /* CONFIG_ARCH_RGMP */
/* Minimum-width integer types */
diff --git a/arch/rgmp/include/com.h b/arch/rgmp/include/x86/arch/com.h
similarity index 98%
rename from arch/rgmp/include/com.h
rename to arch/rgmp/include/x86/arch/com.h
index 918e3bd3fe74f3c78644ee768f9a0729b42e7676..89df901bb3cfd66737eb79d906488ad03c7f128f 100644
--- a/arch/rgmp/include/com.h
+++ b/arch/rgmp/include/x86/arch/com.h
@@ -54,6 +54,5 @@
#define COM_6_BITS 1
#define COM_5_BITS 0
-void up_serialinit(void);
#endif
diff --git a/arch/rgmp/include/x86/arch/subarch/arch.h b/arch/rgmp/include/x86/arch/subarch/arch.h
new file mode 100644
index 0000000000000000000000000000000000000000..2f401c03b9711fc36bfdbc4c5596807cced65ca0
--- /dev/null
+++ b/arch/rgmp/include/x86/arch/subarch/arch.h
@@ -0,0 +1,60 @@
+/****************************************************************************
+ * arch/rgmp/include/x86/arch/subarch/arch.h
+ *
+ * Copyright (C) 2011 Yu Qiang. All rights reserved.
+ * Author: Yu Qiang <yuq825@gmail.com>
+ *
+ * This file is a part of NuttX:
+ *
+ * Copyright (C) 2011 Gregory Nutt. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ * 3. Neither the name NuttX nor the names of its contributors may be
+ * used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ ****************************************************************************/
+
+#ifndef __RGMP_ARCH_SUBARCH_ARCH_H
+#define __RGMP_ARCH_SUBARCH_ARCH_H
+
+#ifndef __ASSEMBLY__
+
+#include <rgmp/arch/hpet.h>
+
+
+static inline void up_mdelay(uint32_t msec)
+{
+ hpet_ndelay(msec*1000000);
+}
+
+static inline void up_udelay(uint32_t usec)
+{
+ hpet_udelay(usec*1000);
+}
+
+#endif /* !__ASSEMBLY__ */
+
+#endif
diff --git a/arch/rgmp/src/Makefile b/arch/rgmp/src/Makefile
index ae2c6887611c4fd851dafb86dc74ce26062158b4..f973a28fab3fe5346481eaaadba2942c52afcf54 100644
--- a/arch/rgmp/src/Makefile
+++ b/arch/rgmp/src/Makefile
@@ -34,13 +34,16 @@
############################################################################
-include $(TOPDIR)/Make.defs
+include $(CONFIG_RGMP_SUBARCH)/Make.defs
+RGMP_ARCH_ASRCS := $(addprefix $(CONFIG_RGMP_SUBARCH)/,$(RGMP_ARCH_ASRCS))
+RGMP_ARCH_CSRCS := $(addprefix $(CONFIG_RGMP_SUBARCH)/,$(RGMP_ARCH_CSRCS))
CFLAGS += -I$(TOPDIR)/sched -I$(TOPDIR)/fs
-ASRCS = sigentry.S
+ASRCS = $(RGMP_ARCH_ASRCS)
+CSRCS = nuttx.c rgmp.c bridge.c $(RGMP_ARCH_CSRCS)
AOBJS = $(ASRCS:.S=$(OBJEXT))
-CSRCS = nuttx.c rgmp.c bridge.c com.c
COBJS = $(CSRCS:.c=$(OBJEXT))
SRCS = $(ASRCS) $(CSRCS)
diff --git a/arch/rgmp/src/arm/Make.defs b/arch/rgmp/src/arm/Make.defs
new file mode 100644
index 0000000000000000000000000000000000000000..8185980c67ccc0294ffd4dd4a5b84f1334e47efb
--- /dev/null
+++ b/arch/rgmp/src/arm/Make.defs
@@ -0,0 +1,42 @@
+############################################################################
+# rgmp/arm/Make.defs
+#
+# Copyright (C) 2011 Yu Qiang. All rights reserved.
+# Author: Yu Qiang <yuq825@gmail.com>
+#
+# This file is a part of NuttX:
+#
+# Copyright (C) 2011 Gregory Nutt. All rights reserved.
+#
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in
+# the documentation and/or other materials provided with the
+# distribution.
+# 3. Neither the name Gregory Nutt nor the names of its contributors may be
+# used to endorse or promote products derived from this software
+# without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+############################################################################
+
+RGMP_ARCH_ASRCS = sigentry.S
+RGMP_ARCH_CSRCS = arch_nuttx.c
diff --git a/arch/rgmp/src/arm/arch_nuttx.c b/arch/rgmp/src/arm/arch_nuttx.c
new file mode 100644
index 0000000000000000000000000000000000000000..cb946bfd1a4b3a028db9bec0e1d857ba97aec0da
--- /dev/null
+++ b/arch/rgmp/src/arm/arch_nuttx.c
@@ -0,0 +1,91 @@
+/****************************************************************************
+ * arch/rgmp/src/arm/arch_nuttx.c
+ *
+ * Copyright (C) 2011 Yu Qiang. All rights reserved.
+ * Author: Yu Qiang <yuq825@gmail.com>
+ *
+ * This file is a part of NuttX:
+ *
+ * Copyright (C) 2011 Gregory Nutt. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ * 3. Neither the name NuttX nor the names of its contributors may be
+ * used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ ****************************************************************************/
+
+#include <rgmp/mmu.h>
+#include <rgmp/string.h>
+
+#include <arch/arch.h>
+#include <nuttx/sched.h>
+#include <os_internal.h>
+
+
+void nuttx_arch_init(void)
+{
+
+}
+
+void nuttx_arch_exit(void)
+{
+
+}
+
+void up_initial_state(_TCB *tcb)
+{
+ struct Trapframe *tf;
+
+ if (tcb->pid != 0) {
+ tf = (struct Trapframe *)tcb->adj_stack_ptr-1;
+ memset(tf, 0, sizeof(struct Trapframe));
+ tf->tf_cpsr = SVC_MOD;
+ tf->tf_pc = (uint32_t)tcb->start;
+ tcb->xcp.tf = tf;
+ }
+}
+
+void push_xcptcontext(struct xcptcontext *xcp)
+{
+ xcp->save_eip = xcp->tf->tf_pc;
+ xcp->save_eflags = xcp->tf->tf_cpsr;
+
+ // set interrupts disabled
+ xcp->tf->tf_pc = (uint32_t)up_sigentry;
+ xcp->tf->tf_cpsr |= CPSR_IF;
+}
+
+void pop_xcptcontext(struct xcptcontext *xcp)
+{
+ xcp->tf->tf_pc = xcp->save_eip;
+ xcp->tf->tf_cpsr = xcp->save_eflags;
+}
+
+void raise(void)
+{
+
+}
+
diff --git a/arch/rgmp/src/arm/sigentry.S b/arch/rgmp/src/arm/sigentry.S
new file mode 100644
index 0000000000000000000000000000000000000000..1e413450bf6573c61f7215f23eb366fe0c38fa06
--- /dev/null
+++ b/arch/rgmp/src/arm/sigentry.S
@@ -0,0 +1,49 @@
+/****************************************************************************
+ * arch/rgmp/src/arm/sigentry.S
+ *
+ * Copyright (C) 2011 Yu Qiang. All rights reserved.
+ * Author: Yu Qiang <yuq825@gmail.com>
+ *
+ * This file is a part of NuttX:
+ *
+ * Copyright (C) 2011 Gregory Nutt. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ * 3. Neither the name NuttX nor the names of its contributors may be
+ * used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ ****************************************************************************/
+
+ .globl up_sigentry
+up_sigentry:
+ sub sp, sp, #68 @ 68 is the size of Trapframe
+ mov r0, sp
+ bl up_sigdeliver
+ add sp, sp, #4 @ skip current_task
+ pop {r0-r12, lr}
+ rfefd sp!
+
+
\ No newline at end of file
diff --git a/arch/rgmp/src/nuttx.c b/arch/rgmp/src/nuttx.c
index b81fc98dd7e7a61f12a7c00353c532100f44b7b4..14b3e6d1d4d96783c904218cd29c4faf982800f6 100644
--- a/arch/rgmp/src/nuttx.c
+++ b/arch/rgmp/src/nuttx.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * arch/rgmp/src/bridge.c
+ * arch/rgmp/src/nuttx.c
*
* Copyright (C) 2011 Yu Qiang. All rights reserved.
* Author: Yu Qiang <yuq825@gmail.com>
@@ -39,12 +39,13 @@
#include <rgmp/boot.h>
#include <rgmp/pmap.h>
-#include <rgmp/x86.h>
#include <rgmp/assert.h>
#include <rgmp/spinlock.h>
-#include <rgmp/console.h>
#include <rgmp/string.h>
-#include <rgmp/fpu.h>
+
+#include <rgmp/arch/arch.h>
+#include <rgmp/arch/console.h>
+
#include <nuttx/sched.h>
#include <nuttx/kmalloc.h>
#include <nuttx/arch.h>
@@ -52,11 +53,11 @@
#include <stdlib.h>
#include <arch/irq.h>
#include <arch/arch.h>
-#include <arch/com.h>
#include <os_internal.h>
_TCB *current_task = NULL;
+
/**
* This function is called in non-interrupt context
* to switch tasks.
@@ -75,9 +76,7 @@ static inline void up_switchcontext(_TCB *ctcb, _TCB *ntcb)
// start switch
current_task = ntcb;
- asm volatile ("int $0x40"
- ::"a"(ctcb?&ctcb->xcp.tf:NULL),
- "b"(ntcb->xcp.tf));
+ rgmp_context_switch(ctcb?&ctcb->xcp.tf:NULL, ntcb->xcp.tf);
}
void up_initialize(void)
@@ -85,7 +84,7 @@ void up_initialize(void)
extern pidhash_t g_pidhash[];
extern void up_register_bridges(void);
extern void vnet_initialize(void);
- extern void e1000_mod_init(void);
+ extern void nuttx_arch_init(void);
// intialize the current_task to g_idletcb
current_task = g_pidhash[PIDHASH(0)].tcb;
@@ -98,38 +97,15 @@ void up_initialize(void)
vnet_initialize();
#endif
- // setup COM device
- up_serialinit();
-
-#ifdef CONFIG_NET_E1000
- // setup e1000
- e1000_mod_init();
-#endif
+ nuttx_arch_init();
// enable interrupt
- sti();
+ local_irq_enable();
}
void up_idle(void)
{
- asm volatile("hlt");
-}
-
-void up_initial_state(_TCB *tcb)
-{
- struct Trapframe *tf;
-
- if (tcb->pid != 0) {
- tf = (struct Trapframe *)tcb->adj_stack_ptr-1;
- memset(tf, 0, sizeof(struct Trapframe));
- tf->tf_fpu = rgmp_fpu_init_regs;
- tf->tf_eflags = 0x00000202;
- tf->tf_cs = GD_KT;
- tf->tf_ds = GD_KD;
- tf->tf_es = GD_KD;
- tf->tf_eip = (uint32_t)tcb->start;
- tcb->xcp.tf = tf;
- }
+ arch_hlt();
}
void up_allocate_heap(void **heap_start, size_t *heap_size)
@@ -160,7 +136,7 @@ int up_create_stack(_TCB *tcb, size_t stack_size)
tcb->adj_stack_size = adj_stack_size;
tcb->stack_alloc_ptr = stack_alloc_ptr;
- tcb->adj_stack_ptr = adj_stack_ptr;
+ tcb->adj_stack_ptr = (void *)((unsigned int)adj_stack_ptr & ~7);
ret = OK;
}
return ret;
@@ -181,7 +157,7 @@ int up_use_stack(_TCB *tcb, void *stack, size_t stack_size)
tcb->adj_stack_size = adj_stack_size;
tcb->stack_alloc_ptr = stack;
- tcb->adj_stack_ptr = adj_stack_ptr;
+ tcb->adj_stack_ptr = (void *)((unsigned int)adj_stack_ptr & ~7);
return OK;
}
@@ -472,12 +448,7 @@ void up_schedule_sigaction(_TCB *tcb, sig_deliver_t sigdeliver)
// some non-running task.
else {
tcb->xcp.sigdeliver = sigdeliver;
- tcb->xcp.save_eip = tcb->xcp.tf->tf_eip;
- tcb->xcp.save_eflags = tcb->xcp.tf->tf_eflags;
-
- // Then set up to the trampoline with interrupts disabled
- tcb->xcp.tf->tf_eip = (uint32_t)up_sigentry;
- tcb->xcp.tf->tf_eflags = 0;
+ push_xcptcontext(&tcb->xcp);
}
popcli(flags);
@@ -516,14 +487,13 @@ int up_prioritize_irq(int irq, int priority)
void up_sigdeliver(struct Trapframe *tf)
{
sig_deliver_t sigdeliver;
-
- tf->tf_eip = current_task->xcp.save_eip;
- tf->tf_eflags = current_task->xcp.save_eflags;
+
+ pop_xcptcontext(¤t_task->xcp);
sigdeliver = current_task->xcp.sigdeliver;
current_task->xcp.sigdeliver = NULL;
- sti();
+ local_irq_enable();
sigdeliver(current_task);
- cli();
+ local_irq_disable();
}
diff --git a/arch/rgmp/src/rgmp.c b/arch/rgmp/src/rgmp.c
index 6cc7aceb4a14e08ef9803aca30ee7db90547df56..40fad1f87a95c0f32cdb7ec8e88cdc85a939a3c6 100644
--- a/arch/rgmp/src/rgmp.c
+++ b/arch/rgmp/src/rgmp.c
@@ -37,8 +37,10 @@
*
****************************************************************************/
-#include <rgmp/x86.h>
#include <rgmp/trap.h>
+#include <rgmp/mmu.h>
+#include <rgmp/arch/arch.h>
+
#include <nuttx/config.h>
#include <nuttx/init.h>
#include <nuttx/arch.h>
@@ -66,7 +68,7 @@ void rtos_entry(void)
void *rtos_get_page(void)
{
- return memalign(4096, 4096);
+ return memalign(PTMEMSIZE, PTMEMSIZE);
}
void rtos_free_page(void *page)
@@ -86,19 +88,15 @@ void rtos_enter_interrupt(struct Trapframe *tf)
void rtos_exit_interrupt(struct Trapframe *tf)
{
- cli();
+ local_irq_disable();
nest_irq--;
if (!nest_irq) {
_TCB *rtcb = current_task;
_TCB *ntcb;
if (rtcb->xcp.sigdeliver) {
- rtcb->xcp.save_eip = tf->tf_eip;
- rtcb->xcp.save_eflags = tf->tf_eflags;
-
- // Then set up to the trampoline with interrupts disabled
- tf->tf_eip = (uint32_t)up_sigentry;
- tf->tf_eflags = 0;
+ rtcb->xcp.tf = tf;
+ push_xcptcontext(&rtcb->xcp);
}
ntcb = (_TCB*)g_readytorun.head;
// switch needed
@@ -156,16 +154,14 @@ int rtos_sem_down(void *sem)
void rtos_stop_running(void)
{
- extern void e1000_mod_exit(void);
+ extern void nuttx_arch_exit(void);
- cli();
-
-#ifdef CONFIG_NET_E1000
- e1000_mod_exit();
-#endif
+ local_irq_disable();
+
+ nuttx_arch_exit();
while(1) {
- asm volatile("hlt");
+ arch_hlt();
}
}
diff --git a/arch/rgmp/src/x86/Make.defs b/arch/rgmp/src/x86/Make.defs
new file mode 100644
index 0000000000000000000000000000000000000000..5fb40006e68b6c213919fa217040c2b19c0868c6
--- /dev/null
+++ b/arch/rgmp/src/x86/Make.defs
@@ -0,0 +1,42 @@
+############################################################################
+# rgmp/x86/Make.defs
+#
+# Copyright (C) 2011 Yu Qiang. All rights reserved.
+# Author: Yu Qiang <yuq825@gmail.com>
+#
+# This file is a part of NuttX:
+#
+# Copyright (C) 2011 Gregory Nutt. All rights reserved.
+#
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in
+# the documentation and/or other materials provided with the
+# distribution.
+# 3. Neither the name Gregory Nutt nor the names of its contributors may be
+# used to endorse or promote products derived from this software
+# without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+############################################################################
+
+RGMP_ARCH_ASRCS = sigentry.S
+RGMP_ARCH_CSRCS = com.c arch_nuttx.c
diff --git a/arch/rgmp/src/x86/arch_nuttx.c b/arch/rgmp/src/x86/arch_nuttx.c
new file mode 100644
index 0000000000000000000000000000000000000000..c7b7577f36383003f9cfb71150d9f092c1c200ef
--- /dev/null
+++ b/arch/rgmp/src/x86/arch_nuttx.c
@@ -0,0 +1,106 @@
+/****************************************************************************
+ * arch/rgmp/src/x86/arch_nuttx.c
+ *
+ * Copyright (C) 2011 Yu Qiang. All rights reserved.
+ * Author: Yu Qiang <yuq825@gmail.com>
+ *
+ * This file is a part of NuttX:
+ *
+ * Copyright (C) 2011 Gregory Nutt. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ * 3. Neither the name NuttX nor the names of its contributors may be
+ * used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ ****************************************************************************/
+
+#include <rgmp/pmap.h>
+#include <rgmp/string.h>
+#include <rgmp/arch/fpu.h>
+
+#include <arch/arch.h>
+#include <nuttx/sched.h>
+#include <os_internal.h>
+
+
+void nuttx_arch_init(void)
+{
+ extern void e1000_mod_init(void);
+ extern void up_serialinit(void);
+
+ // setup COM device
+ up_serialinit();
+
+#ifdef CONFIG_NET_E1000
+ // setup e1000
+ e1000_mod_init();
+#endif
+
+}
+
+void nuttx_arch_exit(void)
+{
+ extern void e1000_mod_exit(void);
+
+#ifdef CONFIG_NET_E1000
+ e1000_mod_exit();
+#endif
+
+}
+
+void up_initial_state(_TCB *tcb)
+{
+ struct Trapframe *tf;
+
+ if (tcb->pid != 0) {
+ tf = (struct Trapframe *)tcb->adj_stack_ptr-1;
+ memset(tf, 0, sizeof(struct Trapframe));
+ tf->tf_fpu = rgmp_fpu_init_regs;
+ tf->tf_eflags = 0x00000202;
+ tf->tf_cs = GD_KT;
+ tf->tf_ds = GD_KD;
+ tf->tf_es = GD_KD;
+ tf->tf_eip = (uint32_t)tcb->start;
+ tcb->xcp.tf = tf;
+ }
+}
+
+void push_xcptcontext(struct xcptcontext *xcp)
+{
+ xcp->save_eip = xcp->tf->tf_eip;
+ xcp->save_eflags = xcp->tf->tf_eflags;
+
+ // set up signal entry with interrupts disabled
+ xcp->tf->tf_eip = (uint32_t)up_sigentry;
+ xcp->tf->tf_eflags = 0;
+}
+
+void pop_xcptcontext(struct xcptcontext *xcp)
+{
+ xcp->tf->tf_eip = xcp->save_eip;
+ xcp->tf->tf_eflags = xcp->save_eflags;
+}
+
diff --git a/arch/rgmp/src/com.c b/arch/rgmp/src/x86/com.c
similarity index 99%
rename from arch/rgmp/src/com.c
rename to arch/rgmp/src/x86/com.c
index e1b8febb2a9ed9233d94a9998784b5e5474f6fc2..36ca15238b42720d368a57f29b5b71d8dbeb8241 100644
--- a/arch/rgmp/src/com.c
+++ b/arch/rgmp/src/x86/com.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * arch/rgmp/src/com.c
+ * arch/rgmp/src/x86/com.c
*
* Copyright (C) 2011 Yu Qiang. All rights reserved.
* Copyright (C) 2011 Gregory Nutt. All rights reserved.
@@ -57,7 +57,7 @@
#include <arch/com.h>
#include <rgmp/trap.h>
-#include <rgmp/console.h>
+#include <rgmp/arch/console.h>
/****************************************************************************
* Pre-processor Definitions
diff --git a/arch/rgmp/src/sigentry.S b/arch/rgmp/src/x86/sigentry.S
similarity index 98%
rename from arch/rgmp/src/sigentry.S
rename to arch/rgmp/src/x86/sigentry.S
index b2f9d628326ebd114d8ca3b915cbb0f8637fe13a..98891c0268323b1885efb8522806f933bfd1be07 100644
--- a/arch/rgmp/src/sigentry.S
+++ b/arch/rgmp/src/x86/sigentry.S
@@ -1,5 +1,5 @@
/****************************************************************************
- * arch/rgmp/src/sigentry.S
+ * arch/rgmp/src/x86/sigentry.S
*
* Copyright (C) 2011 Yu Qiang. All rights reserved.
* Author: Yu Qiang <yuq825@gmail.com>
diff --git a/configs/rgmp/README.txt b/configs/rgmp/README.txt
index 2db1d6b13d96ee6560e3c5a487d6d83be6b2fdd8..3e4603e7e984ac4b42b57fdcf088e49366d14fd3 100755
--- a/configs/rgmp/README.txt
+++ b/configs/rgmp/README.txt
@@ -16,12 +16,16 @@ http://rgmp.sourceforge.net/wiki/index.php/Documentation
Ubuntu Build Instructions
--------------------------
Build requirements:
-Hardware: x86 PC
-Software: Ubuntu 10.04, 10.10 or 11.04
+ * x86 PC:
+ Ubuntu 10.04, 10.10 or 11.04
+ * OMAP4430 pandaboard:
+ Ubuntu 11.04
Run requirements:
-Hardware: multi-processor x86 PC
-Software: Ubuntu 10.04, 10.10 or 11.04
+ * multi-processor x86 PC:
+ Ubuntu 10.04, 10.10 or 11.04
+ * OMAP4430 pandaboard:
+ Ubuntu 11.04
1. Download RGMP from the following URL:
@@ -45,12 +49,12 @@ Software: Ubuntu 10.04, 10.10 or 11.04
$ sudo /usr/rgmp/setup
$ exit
-4. Configure NuttX. For example, for the RGMP NSH configuration, do the
+4. Configure NuttX. For example, for the RGMP x86 NSH configuration, do the
following:
$ cd <nuttx-dir>
$ cd tools
- $ ./configure.sh rgmp/nsh
+ $ ./configure.sh rgmp/x86/nsh
$ cd ..
5. Build NuttX. Get the binary image at <nuttx-dir>/kernel.img.
@@ -68,8 +72,10 @@ Software: Ubuntu 10.04, 10.10 or 11.04
Other Linux OS Build Instruction
--------------------------------------
Requirements:
-Hardware: multi-processor x86 PC
-Software: running Linux kernel 2.6.32, 2.6.35 or 2.6.38
+ * multi-processor x86 PC
+ running Linux kernel 2.6.32, 2.6.35 or 2.6.38
+ * OMAP4430 pandaboard
+ running Linux kernel 2.6.38
1. Get your running Linux kernel header under /usr/src/linux-headers-$(uname -r)
directory.
diff --git a/configs/rgmp/arm/default/Make.defs b/configs/rgmp/arm/default/Make.defs
new file mode 100644
index 0000000000000000000000000000000000000000..19d643cc37bcfe0fd5d499c48b0057bdb08b784f
--- /dev/null
+++ b/configs/rgmp/arm/default/Make.defs
@@ -0,0 +1,117 @@
+############################################################################
+# configs/rgmp/default/Make.defs
+#
+# Copyright (C) 2011 Yu Qiang. All rights reserved.
+# Copyright (C) 2011 Gregory Nutt. All rights reserved.
+# Authors: Yu Qiang <yuq825@gmail.com>
+# Gregory Nutt <spudmonkey@racsa.co.cr>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in
+# the documentation and/or other materials provided with the
+# distribution.
+# 3. Neither the name NuttX nor the names of its contributors may be
+# used to endorse or promote products derived from this software
+# without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+############################################################################
+
+include ${TOPDIR}/.config
+
+RGMPLIBDIR := $(RGMP_INST_DIR)/lib
+RGMPINCDIR := $(RGMP_INST_DIR)/include
+RGMPLKSCPT := $(RGMP_INST_DIR)/etc/rgmp.ld
+
+HOSTOS = ${shell uname -o}
+
+ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
+ ARCHOPTIMIZATION = -O2 -gstabs
+else
+ ARCHOPTIMIZATION = -O2
+endif
+
+ARCHCPUFLAGS = -fno-builtin -nostdinc -fno-stack-protector -fno-omit-frame-pointer \
+ -marm -march=armv7-a
+ARCHPICFLAGS = -fpic
+ARCHWARNINGS = -Wall -Wstrict-prototypes -Wshadow
+ARCHDEFINES =
+ARCHINCLUDES = -I. -isystem $(TOPDIR)/include -I$(RGMPINCDIR) \
+ -I$(TOPDIR)/configs/rgmp/include -I$(TOPDIR)/arch/rgmp/include/arm
+ARCHSCRIPT =
+
+CROSSDEV =
+CC = $(CROSSDEV)gcc
+CPP = $(CROSSDEV)gcc -E
+LD = $(CROSSDEV)ld
+AR = $(CROSSDEV)ar rcs
+NM = $(CROSSDEV)nm
+OBJCOPY = $(CROSSDEV)objcopy
+OBJDUMP = $(CROSSDEV)objdump
+
+CFLAGS = $(ARCHWARNINGS) $(ARCHOPTIMIZATION) \
+ $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES) -pipe
+CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES)
+AFLAGS = $(CFLAGS) -D__ASSEMBLY__
+
+OBJEXT = .o
+LIBEXT = .a
+
+ifeq ($(HOSTOS),Cygwin)
+ EXEEXT = .exe
+else
+ EXEEXT =
+endif
+
+LDFLAGS += -nostdlib
+EXTRA_LIBS =
+
+define PREPROCESS
+ @echo "CPP: $1->$2"
+ @$(CPP) $(CPPFLAGS) $1 -o $2
+endef
+
+define COMPILE
+ @echo "CC: $1"
+ @$(CC) -c $(CFLAGS) $1 -o $2
+endef
+
+define ASSEMBLE
+ @echo "AS: $1"
+ @$(CC) -c $(AFLAGS) $1 -o $2
+endef
+
+define ARCHIVE
+ echo "AR: $2"; \
+ $(AR) $1 $2 || { echo "$(AR) $1 $2 FAILED!" ; exit 1 ; }
+endef
+
+define CLEAN
+ @rm -f *.o *.a
+endef
+
+MKDEP = $(TOPDIR)/tools/mkdeps.sh
+
+HOSTCC = gcc
+HOSTINCLUDES = -I.
+HOSTCFLAGS = $(ARCHWARNINGS) $(ARCHOPTIMIZATION) \
+ $(ARCHCPUFLAGS) $(HOSTINCLUDES) $(ARCHDEFINES) -pipe
+HOSTLDFLAGS =
diff --git a/configs/rgmp/default/appconfig b/configs/rgmp/arm/default/appconfig
similarity index 100%
rename from configs/rgmp/default/appconfig
rename to configs/rgmp/arm/default/appconfig
diff --git a/configs/rgmp/arm/default/defconfig b/configs/rgmp/arm/default/defconfig
new file mode 100644
index 0000000000000000000000000000000000000000..5723276e39535f07100de8c270d484b6364106f2
--- /dev/null
+++ b/configs/rgmp/arm/default/defconfig
@@ -0,0 +1,403 @@
+############################################################################
+# configs/rgmp/default/defconfig
+#
+# Copyright (C) 2011 Yu Qiang. All rights reserved.
+# Copyright (C) 2011 Gregory Nutt. All rights reserved.
+# Authors: Yu Qiang <yuq825@gmail.com>
+# Gregory Nutt <spudmonkey@racsa.co.cr>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in
+# the documentation and/or other materials provided with the
+# distribution.
+# 3. Neither the name NuttX nor the names of its contributors may be
+# used to endorse or promote products derived from this software
+# without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+############################################################################
+#
+# Architecture selection
+#
+# CONFIG_ARCH - identifies the arch subdirectory and, hence, the
+# processor architecture.
+# CONFIG_ARCH_name - for use in C code. This identifies the particular
+# processor architecture (CONFIG_ARCH_SIM).
+# CONFIG_ARCH_BOARD - identifies the configs subdirectory and, hence,
+# the board that supports the particular chip or SoC.
+# CONFIG_ARCH_BOARD_name - for use in C code
+# CONFIG_ENDIAN_BIG - define if big endian (default is little endian)
+#
+CONFIG_ARCH=rgmp
+CONFIG_ARCH_RGMP=y
+CONFIG_ARCH_BOARD=rgmp
+CONFIG_ARCH_BOARD_RGMP=y
+
+#
+# General OS setup
+#
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+# that builds the application to link with NuttX. Default: ../apps
+# CONFIG_DEBUG - enables built-in debug options
+# CONFIG_DEBUG_VERBOSE - enables verbose debug output
+# CONFIG_DEBUG_SYMBOLS - build without optimization and with
+# debug symbols (needed for use with a debugger).
+# CONFIG_MM_REGIONS - If the architecture includes multiple
+# regions of memory to allocate from, this specifies the
+# number of memory regions that the memory manager must
+# handle and enables the API mm_addregion(start, end);
+# CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot
+# time console output
+# CONFIG_MSEC_PER_TICK - The default system timer is 100Hz
+# or MSEC_PER_TICK=10. This setting may be defined to
+# inform NuttX that the processor hardware is providing
+# system timer interrupts at some interrupt interval other
+# than 10 msec.
+# CONFIG_RR_INTERVAL - The round robin timeslice will be set
+# this number of milliseconds; Round robin scheduling can
+# be disabled by setting this value to zero.
+# CONFIG_SCHED_INSTRUMENTATION - enables instrumentation in
+# scheduler to monitor system performance
+# CONFIG_TASK_NAME_SIZE - Spcifies that maximum size of a
+# task name to save in the TCB. Useful if scheduler
+# instrumentation is selected. Set to zero to disable.
+# CONFIG_JULIAN_TIME - Enables Julian time conversions
+# CONFIG_START_YEAR, CONFIG_START_MONTH, CONFIG_START_DAY -
+# Used to initialize the internal time logic.
+# CONFIG_DEV_CONSOLE - Set if architecture-specific logic
+# provides /dev/console. Enables stdout, stderr, stdin.
+# CONFIG_DEV_LOWCONSOLE - Use the simple, low-level serial console
+# driver (minimul support)
+# CONFIG_MUTEX_TYPES: Set to enable support for recursive and
+# errorcheck mutexes. Enables pthread_mutexattr_settype().
+# CONFIG_PRIORITY_INHERITANCE : Set to enable support for priority
+# inheritance on mutexes and semaphores.
+# CONFIG_SEM_PREALLOCHOLDERS: This setting is only used if priority
+# inheritance is enabled. It defines the maximum number of
+# different threads (minus one) that can take counts on a
+# semaphore with priority inheritance support. This may be
+# set to zero if priority inheritance is disabled OR if you
+# are only using semaphores as mutexes (only one holder) OR
+# if no more than two threads participate using a counting
+# semaphore.
+# CONFIG_SEM_NNESTPRIO. If priority inheritance is enabled,
+# then this setting is the maximum number of higher priority
+# threads (minus 1) than can be waiting for another thread
+# to release a count on a semaphore. This value may be set
+# to zero if no more than one thread is expected to wait for
+# a semaphore.
+# CONFIG_FDCLONE_DISABLE. Disable cloning of all file descriptors
+# by task_create() when a new task is started. If set, all
+# files/drivers will appear to be closed in the new task.
+# CONFIG_FDCLONE_STDIO. Disable cloning of all but the first
+# three file descriptors (stdin, stdout, stderr) by task_create()
+# when a new task is started. If set, all files/drivers will
+# appear to be closed in the new task except for stdin, stdout,
+# and stderr.
+# CONFIG_SDCLONE_DISABLE. Disable cloning of all socket
+# desciptors by task_create() when a new task is started. If
+# set, all sockets will appear to be closed in the new task.
+#
+#CONFIG_APPS_DIR=
+CONFIG_DEBUG=n
+CONFIG_DEBUG_VERBOSE=n
+CONFIG_DEBUG_SYMBOLS=n
+CONFIG_MM_REGIONS=1
+CONFIG_ARCH_LOWPUTC=y
+CONFIG_MSEC_PER_TICK=1
+CONFIG_RR_INTERVAL=0
+CONFIG_SCHED_INSTRUMENTATION=n
+CONFIG_TASK_NAME_SIZE=32
+CONFIG_START_YEAR=2007
+CONFIG_START_MONTH=2
+CONFIG_START_DAY=27
+CONFIG_JULIAN_TIME=n
+CONFIG_DEV_CONSOLE=y
+CONFIG_DEV_LOWCONSOLE=n
+CONFIG_MUTEX_TYPES=n
+CONFIG_PRIORITY_INHERITANCE=n
+CONFIG_SEM_PREALLOCHOLDERS=0
+CONFIG_SEM_NNESTPRIO=0
+CONFIG_FDCLONE_DISABLE=n
+CONFIG_FDCLONE_STDIO=n
+CONFIG_SDCLONE_DISABLE=y
+
+#
+# The following can be used to disable categories of
+# APIs supported by the OS. If the compiler supports
+# weak functions, then it should not be necessary to
+# disable functions unless you want to restrict usage
+# of those APIs.
+#
+# There are certain dependency relationships in these
+# features.
+#
+# o mq_notify logic depends on signals to awaken tasks
+# waiting for queues to become full or empty.
+# o pthread_condtimedwait() depends on signals to wake
+# up waiting tasks.
+#
+CONFIG_DISABLE_CLOCK=n
+CONFIG_DISABLE_POSIX_TIMERS=n
+CONFIG_DISABLE_PTHREAD=n
+CONFIG_DISABLE_SIGNALS=n
+CONFIG_DISABLE_MQUEUE=n
+CONFIG_DISABLE_MOUNTPOINT=n
+CONFIG_DISABLE_ENVIRON=n
+CONFIG_DISABLE_POLL=y
+
+#
+# Misc libc settings
+#
+# CONFIG_NOPRINTF_FIELDWIDTH - sprintf-related logic is a
+# little smaller if we do not support fieldwidthes
+#
+CONFIG_NOPRINTF_FIELDWIDTH=n
+
+#
+# Allow for architecture optimized implementations
+#
+# The architecture can provide optimized versions of the
+# following to improve sysem performance
+#
+CONFIG_ARCH_MEMCPY=y
+CONFIG_ARCH_MEMCMP=y
+CONFIG_ARCH_MEMMOVE=y
+CONFIG_ARCH_MEMSET=y
+CONFIG_ARCH_STRCMP=y
+CONFIG_ARCH_STRCPY=y
+CONFIG_ARCH_STRNCPY=y
+CONFIG_ARCH_STRLEN=y
+CONFIG_ARCH_STRNLEN=y
+CONFIG_ARCH_BZERO=n
+CONFIG_ARCH_MATH_H=y
+CONFIG_ARCH_STDINT_H=y
+CONFIG_ARCH_STDBOOL_H=y
+
+#
+# General build options
+#
+# CONFIG_RRLOAD_BINARY - make the rrload binary format used with
+# BSPs from www.ridgerun.com using the tools/mkimage.sh script
+# CONFIG_INTELHEX_BINARY - make the Intel HEX binary format
+# used with many different loaders using the GNU objcopy program
+# Should not be selected if you are not using the GNU toolchain.
+# CONFIG_RAW_BINARY - make a raw binary format file used with many
+# different loaders using the GNU objcopy program. This option
+# should not be selected if you are not using the GNU toolchain.
+# CONFIG_HAVE_LIBM - toolchain supports libm.a
+#
+CONFIG_RRLOAD_BINARY=n
+CONFIG_INTELHEX_BINARY=n
+CONFIG_RAW_BINARY=n
+CONFIG_HAVE_LIBM=n
+
+#
+# Sizes of configurable things (0 disables)
+#
+# CONFIG_MAX_TASKS - The maximum number of simultaneously
+# active tasks. This value must be a power of two.
+# CONFIG_MAX_TASK_ARGS - This controls the maximum number of
+# of parameters that a task may receive (i.e., maxmum value
+# of 'argc')
+# CONFIG_NPTHREAD_KEYS - The number of items of thread-
+# specific data that can be retained
+# CONFIG_NFILE_DESCRIPTORS - The maximum number of file
+# descriptors (one for each open)
+# CONFIG_NFILE_STREAMS - The maximum number of streams that
+# can be fopen'ed
+# CONFIG_NAME_MAX - The maximum size of a file name.
+# CONFIG_STDIO_BUFFER_SIZE - Size of the buffer to allocate
+# on fopen. (Only if CONFIG_NFILE_STREAMS > 0)
+# CONFIG_NUNGET_CHARS - Number of characters that can be
+# buffered by ungetc() (Only if CONFIG_NFILE_STREAMS > 0)
+# CONFIG_PREALLOC_MQ_MSGS - The number of pre-allocated message
+# structures. The system manages a pool of preallocated
+# message structures to minimize dynamic allocations
+# CONFIG_MQ_MAXMSGSIZE - Message structures are allocated with
+# a fixed payload size given by this settin (does not include
+# other message structure overhead.
+# CONFIG_MAX_WDOGPARMS - Maximum number of parameters that
+# can be passed to a watchdog handler
+# CONFIG_PREALLOC_WDOGS - The number of pre-allocated watchdog
+# structures. The system manages a pool of preallocated
+# watchdog structures to minimize dynamic allocations
+# CONFIG_PREALLOC_TIMERS - The number of pre-allocated POSIX
+# timer structures. The system manages a pool of preallocated
+# timer structures to minimize dynamic allocations. Set to
+# zero for all dynamic allocations.
+#
+CONFIG_MAX_TASKS=64
+CONFIG_MAX_TASK_ARGS=4
+CONFIG_NPTHREAD_KEYS=4
+CONFIG_NFILE_DESCRIPTORS=32
+CONFIG_NFILE_STREAMS=16
+CONFIG_NAME_MAX=32
+CONFIG_STDIO_BUFFER_SIZE=64
+CONFIG_NUNGET_CHARS=2
+CONFIG_PREALLOC_MQ_MSGS=32
+CONFIG_MQ_MAXMSGSIZE=32
+CONFIG_MAX_WDOGPARMS=4
+CONFIG_PREALLOC_WDOGS=32
+CONFIG_PREALLOC_TIMERS=8
+CONFIG_STDIO_LINEBUFFER=y
+
+#
+# FAT filesystem configuration
+# CONFIG_FS_FAT - Enable FAT filesystem support
+# CONFIG_FAT_SECTORSIZE - Max supported sector size
+# CONFIG_FS_ROMFS - Enable ROMFS filesystem support
+CONFIG_FS_FAT=n
+CONFIG_FS_ROMFS=n
+
+#
+# TCP/IP and UDP support via uIP
+# CONFIG_NET - Enable or disable all network features
+# CONFIG_NET_IPv6 - Build in support for IPv6
+# CONFIG_NSOCKET_DESCRIPTORS - Maximum number of socket descriptors per task/thread.
+# CONFIG_NET_SOCKOPTS - Enable or disable support for socket options
+# CONFIG_NET_BUFSIZE - uIP buffer size
+# CONFIG_NET_TCP - TCP support on or off
+# CONFIG_NET_TCP_CONNS - Maximum number of TCP connections (all tasks)
+# CONFIG_NET_TCP_READAHEAD_BUFSIZE - Size of TCP read-ahead buffers
+# CONFIG_NET_NTCP_READAHEAD_BUFFERS - Number of TCP read-ahead buffers (may be zero)
+# CONFIG_NET_TCPBACKLOG - Incoming connections pend in a backlog until
+# accept() is called. The size of the backlog is selected when listen() is called.
+# CONFIG_NET_MAX_LISTENPORTS - Maximum number of listening TCP ports (all tasks)
+# CONFIG_NET_UDP - UDP support on or off
+# CONFIG_NET_UDP_CHECKSUMS - UDP checksums on or off
+# CONFIG_NET_UDP_CONNS - The maximum amount of concurrent UDP connections
+# CONFIG_NET_ICMP - ICMP ping response support on or off
+# CONFIG_NET_ICMP_PING - ICMP ping request support on or off
+# CONFIG_NET_PINGADDRCONF - Use "ping" packet for setting IP address
+# CONFIG_NET_STATISTICS - uIP statistics on or off
+# CONFIG_NET_RECEIVE_WINDOW - The size of the advertised receiver's window
+# CONFIG_NET_ARPTAB_SIZE - The size of the ARP table
+# CONFIG_NET_BROADCAST - Broadcast support
+# CONFIG_NET_LLH_LEN - The link level header length
+# CONFIG_NET_FWCACHE_SIZE - number of packets to remember when looking for duplicates
+CONFIG_NET=y
+CONFIG_NET_IPv6=n
+CONFIG_NSOCKET_DESCRIPTORS=5
+CONFIG_NET_SOCKOPTS=y
+CONFIG_NET_BUFSIZE=1514
+CONFIG_NET_TCP=y
+CONFIG_NET_TCP_CONNS=40
+CONFIG_NET_MAX_LISTENPORTS=40
+CONFIG_NET_UDP=y
+CONFIG_NET_UDP_CHECKSUMS=y
+#CONFIG_NET_UDP_CONNS=10
+CONFIG_NET_ICMP=y
+CONFIG_NET_ICMP_PING=y
+#CONFIG_NET_PINGADDRCONF=0
+CONFIG_NET_STATISTICS=y
+#CONFIG_NET_RECEIVE_WINDOW=128
+#CONFIG_NET_ARPTAB_SIZE=8
+CONFIG_NET_BROADCAST=n
+#CONFIG_NET_LLH_LEN=14
+#CONFIG_NET_FWCACHE_SIZE=2
+
+#
+# UIP Network Utilities
+# CONFIG_NET_DHCP_LIGHT - Reduces size of DHCP
+# CONFIG_NET_RESOLV_ENTRIES - Number of resolver entries
+CONFIG_NET_DHCP_LIGHT=n
+CONFIG_NET_RESOLV_ENTRIES=4
+
+#
+# Settings for examples/uip
+CONFIG_EXAMPLE_UIP_IPADDR=(192<<24|168<<16|10<<8|2)
+CONFIG_EXAMPLE_UIP_DRIPADDR=(192<<24|168<<16|10<<8|1)
+CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0)
+CONFIG_EXAMPLE_UIP_DHCPC=n
+
+#
+# Settings for examples/nettest
+CONFIG_EXAMPLE_NETTEST_SERVER=n
+CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
+CONFIG_EXAMPLE_NETTEST_NOMAC=n
+CONFIG_EXAMPLE_NETTEST_IPADDR=(192<<24|168<<16|0<<8|128)
+CONFIG_EXAMPLE_NETTEST_DRIPADDR=(192<<24|168<<16|0<<8|1)
+CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0)
+CONFIG_EXAMPLE_NETTEST_CLIENTIP=(192<<24|168<<16|0<<8|106)
+
+#
+# Settings for examples/nsh
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_CMD_SIZE=40
+CONFIG_NSH_STACKSIZE=4096
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=n
+CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
+CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+
+#
+# Stack and heap information
+#
+# CONFIG_BOOT_RUNFROMFLASH - Some configurations support XIP
+# operation from FLASH but must copy initialized .data sections to RAM.
+# CONFIG_BOOT_COPYTORAM - Some configurations boot in FLASH
+# but copy themselves entirely into RAM for better performance.
+# CONFIG_CUSTOM_STACK - The up_ implementation will handle
+# all stack operations outside of the nuttx model.
+# CONFIG_STACK_POINTER - The initial stack pointer
+# CONFIG_IDLETHREAD_STACKSIZE - The size of the initial stack.
+# This is the thread that (1) performs the inital boot of the system up
+# to the point where user_start() is spawned, and (2 after is the
+# IDLE thread that executes only when there is no other thread ready to
+# run.
+# CONFIG_USERMAIN_STACKSIZE - The size of the stack to allocate
+# for the main user thread that begins at the user_start() entry point.
+# CONFIG_PTHREAD_STACK_MIN - Minimum pthread stack size
+# CONFIG_PTHREAD_STACK_DEFAULT - Default pthread stack size
+# CONFIG_HEAP_BASE - The beginning of the heap
+# CONFIG_HEAP_SIZE - The size of the heap
+#
+CONFIG_BOOT_RUNFROMFLASH=n
+CONFIG_BOOT_COPYTORAM=n
+CONFIG_CUSTOM_STACK=n
+CONFIG_IDLETHREAD_STACKSIZE=4096
+CONFIG_USERMAIN_STACKSIZE=4096
+CONFIG_PTHREAD_STACK_MIN=256
+CONFIG_PTHREAD_STACK_DEFAULT=8192
+CONFIG_HEAP_BASE=
+CONFIG_HEAP_SIZE=
+
+
+##########################################
+# RGMP specific configuration
+##########################################
+
+#
+# arch
+#
+CONFIG_RGMP_SUBARCH=arm
+
+#
+# VNET
+#
+CONFIG_NET_VNET=y
+CONFIG_VNET_NINTERFACES=1
+
+
diff --git a/configs/rgmp/default/setenv.sh b/configs/rgmp/arm/default/setenv.sh
old mode 100755
new mode 100644
similarity index 100%
rename from configs/rgmp/default/setenv.sh
rename to configs/rgmp/arm/default/setenv.sh
diff --git a/configs/rgmp/arm/nsh/Make.defs b/configs/rgmp/arm/nsh/Make.defs
new file mode 100644
index 0000000000000000000000000000000000000000..3bb764a1cc3a9ba0fc2800cbf67a9715d07d59be
--- /dev/null
+++ b/configs/rgmp/arm/nsh/Make.defs
@@ -0,0 +1,117 @@
+############################################################################
+# configs/rgmp/nsh/Make.defs
+#
+# Copyright (C) 2011 Yu Qiang. All rights reserved.
+# Copyright (C) 2011 Gregory Nutt. All rights reserved.
+# Authors: Yu Qiang <yuq825@gmail.com>
+# Gregory Nutt <spudmonkey@racsa.co.cr>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in
+# the documentation and/or other materials provided with the
+# distribution.
+# 3. Neither the name NuttX nor the names of its contributors may be
+# used to endorse or promote products derived from this software
+# without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+############################################################################
+
+include ${TOPDIR}/.config
+
+RGMPLIBDIR := $(RGMP_INST_DIR)/lib
+RGMPINCDIR := $(RGMP_INST_DIR)/include
+RGMPLKSCPT := $(RGMP_INST_DIR)/etc/rgmp.ld
+
+HOSTOS = ${shell uname -o}
+
+ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
+ ARCHOPTIMIZATION = -O2 -gstabs
+else
+ ARCHOPTIMIZATION = -O2
+endif
+
+ARCHCPUFLAGS = -fno-builtin -nostdinc -fno-stack-protector -fno-omit-frame-pointer \
+ -marm -march=armv7-a
+ARCHPICFLAGS = -fpic
+ARCHWARNINGS = -Wall -Wstrict-prototypes -Wshadow
+ARCHDEFINES =
+ARCHINCLUDES = -I. -isystem $(TOPDIR)/include -I$(RGMPINCDIR) \
+ -I$(TOPDIR)/configs/rgmp/include -I$(TOPDIR)/arch/rgmp/include/arm
+ARCHSCRIPT =
+
+CROSSDEV =
+CC = $(CROSSDEV)gcc
+CPP = $(CROSSDEV)gcc -E
+LD = $(CROSSDEV)ld
+AR = $(CROSSDEV)ar rcs
+NM = $(CROSSDEV)nm
+OBJCOPY = $(CROSSDEV)objcopy
+OBJDUMP = $(CROSSDEV)objdump
+
+CFLAGS = $(ARCHWARNINGS) $(ARCHOPTIMIZATION) \
+ $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES) -pipe
+CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES)
+AFLAGS = $(CFLAGS) -D__ASSEMBLY__
+
+OBJEXT = .o
+LIBEXT = .a
+
+ifeq ($(HOSTOS),Cygwin)
+ EXEEXT = .exe
+else
+ EXEEXT =
+endif
+
+LDFLAGS += -nostdlib
+EXTRA_LIBS =
+
+define PREPROCESS
+ @echo "CPP: $1->$2"
+ @$(CPP) $(CPPFLAGS) $1 -o $2
+endef
+
+define COMPILE
+ @echo "CC: $1"
+ @$(CC) -c $(CFLAGS) $1 -o $2
+endef
+
+define ASSEMBLE
+ @echo "AS: $1"
+ @$(CC) -c $(AFLAGS) $1 -o $2
+endef
+
+define ARCHIVE
+ echo "AR: $2"; \
+ $(AR) $1 $2 || { echo "$(AR) $1 $2 FAILED!" ; exit 1 ; }
+endef
+
+define CLEAN
+ @rm -f *.o *.a
+endef
+
+MKDEP = $(TOPDIR)/tools/mkdeps.sh
+
+HOSTCC = gcc
+HOSTINCLUDES = -I.
+HOSTCFLAGS = $(ARCHWARNINGS) $(ARCHOPTIMIZATION) \
+ $(ARCHCPUFLAGS) $(HOSTINCLUDES) $(ARCHDEFINES) -pipe
+HOSTLDFLAGS =
diff --git a/configs/rgmp/nsh/appconfig b/configs/rgmp/arm/nsh/appconfig
similarity index 100%
rename from configs/rgmp/nsh/appconfig
rename to configs/rgmp/arm/nsh/appconfig
diff --git a/configs/rgmp/arm/nsh/defconfig b/configs/rgmp/arm/nsh/defconfig
new file mode 100644
index 0000000000000000000000000000000000000000..25c3ed3b4bbfc93778ba3f87df7f2ae37d3743f1
--- /dev/null
+++ b/configs/rgmp/arm/nsh/defconfig
@@ -0,0 +1,433 @@
+############################################################################
+# configs/rgmp/nsh/defconfig
+#
+# Copyright (C) 2011 Yu Qiang. All rights reserved.
+# Copyright (C) 2011 Gregory Nutt. All rights reserved.
+# Authors: Yu Qiang <yuq825@gmail.com>
+# Gregory Nutt <spudmonkey@racsa.co.cr>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in
+# the documentation and/or other materials provided with the
+# distribution.
+# 3. Neither the name NuttX nor the names of its contributors may be
+# used to endorse or promote products derived from this software
+# without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+############################################################################
+#
+# Architecture selection
+#
+# CONFIG_ARCH - identifies the arch subdirectory and, hence, the
+# processor architecture.
+# CONFIG_ARCH_name - for use in C code. This identifies the particular
+# processor architecture (CONFIG_ARCH_SIM).
+# CONFIG_ARCH_BOARD - identifies the configs subdirectory and, hence,
+# the board that supports the particular chip or SoC.
+# CONFIG_ARCH_BOARD_name - for use in C code
+# CONFIG_ENDIAN_BIG - define if big endian (default is little endian)
+#
+CONFIG_ARCH=rgmp
+CONFIG_ARCH_RGMP=y
+CONFIG_ARCH_BOARD=rgmp
+CONFIG_ARCH_BOARD_RGMP=y
+
+#
+# General OS setup
+#
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+# that builds the application to link with NuttX. Default: ../apps
+# CONFIG_DEBUG - enables built-in debug options
+# CONFIG_DEBUG_VERBOSE - enables verbose debug output
+# CONFIG_DEBUG_SYMBOLS - build without optimization and with
+# debug symbols (needed for use with a debugger).
+# CONFIG_MM_REGIONS - If the architecture includes multiple
+# regions of memory to allocate from, this specifies the
+# number of memory regions that the memory manager must
+# handle and enables the API mm_addregion(start, end);
+# CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot
+# time console output
+# CONFIG_MSEC_PER_TICK - The default system timer is 100Hz
+# or MSEC_PER_TICK=10. This setting may be defined to
+# inform NuttX that the processor hardware is providing
+# system timer interrupts at some interrupt interval other
+# than 10 msec.
+# CONFIG_RR_INTERVAL - The round robin timeslice will be set
+# this number of milliseconds; Round robin scheduling can
+# be disabled by setting this value to zero.
+# CONFIG_SCHED_INSTRUMENTATION - enables instrumentation in
+# scheduler to monitor system performance
+# CONFIG_TASK_NAME_SIZE - Spcifies that maximum size of a
+# task name to save in the TCB. Useful if scheduler
+# instrumentation is selected. Set to zero to disable.
+# CONFIG_JULIAN_TIME - Enables Julian time conversions
+# CONFIG_START_YEAR, CONFIG_START_MONTH, CONFIG_START_DAY -
+# Used to initialize the internal time logic.
+# CONFIG_DEV_CONSOLE - Set if architecture-specific logic
+# provides /dev/console. Enables stdout, stderr, stdin.
+# CONFIG_DEV_LOWCONSOLE - Use the simple, low-level serial console
+# driver (minimul support)
+# CONFIG_MUTEX_TYPES: Set to enable support for recursive and
+# errorcheck mutexes. Enables pthread_mutexattr_settype().
+# CONFIG_PRIORITY_INHERITANCE : Set to enable support for priority
+# inheritance on mutexes and semaphores.
+# CONFIG_SEM_PREALLOCHOLDERS: This setting is only used if priority
+# inheritance is enabled. It defines the maximum number of
+# different threads (minus one) that can take counts on a
+# semaphore with priority inheritance support. This may be
+# set to zero if priority inheritance is disabled OR if you
+# are only using semaphores as mutexes (only one holder) OR
+# if no more than two threads participate using a counting
+# semaphore.
+# CONFIG_SEM_NNESTPRIO. If priority inheritance is enabled,
+# then this setting is the maximum number of higher priority
+# threads (minus 1) than can be waiting for another thread
+# to release a count on a semaphore. This value may be set
+# to zero if no more than one thread is expected to wait for
+# a semaphore.
+# CONFIG_FDCLONE_DISABLE. Disable cloning of all file descriptors
+# by task_create() when a new task is started. If set, all
+# files/drivers will appear to be closed in the new task.
+# CONFIG_FDCLONE_STDIO. Disable cloning of all but the first
+# three file descriptors (stdin, stdout, stderr) by task_create()
+# when a new task is started. If set, all files/drivers will
+# appear to be closed in the new task except for stdin, stdout,
+# and stderr.
+# CONFIG_SDCLONE_DISABLE. Disable cloning of all socket
+# desciptors by task_create() when a new task is started. If
+# set, all sockets will appear to be closed in the new task.
+#
+#CONFIG_APPS_DIR=
+CONFIG_DEBUG=y
+CONFIG_DEBUG_VERBOSE=n
+CONFIG_DEBUG_SYMBOLS=y
+CONFIG_MM_REGIONS=1
+CONFIG_ARCH_LOWPUTC=y
+CONFIG_MSEC_PER_TICK=1
+CONFIG_RR_INTERVAL=0
+CONFIG_SCHED_INSTRUMENTATION=n
+CONFIG_TASK_NAME_SIZE=32
+CONFIG_START_YEAR=2007
+CONFIG_START_MONTH=2
+CONFIG_START_DAY=27
+CONFIG_JULIAN_TIME=n
+CONFIG_DEV_CONSOLE=y
+CONFIG_DEV_LOWCONSOLE=n
+CONFIG_MUTEX_TYPES=n
+CONFIG_PRIORITY_INHERITANCE=n
+CONFIG_SEM_PREALLOCHOLDERS=0
+CONFIG_SEM_NNESTPRIO=0
+CONFIG_FDCLONE_DISABLE=n
+CONFIG_FDCLONE_STDIO=n
+CONFIG_SDCLONE_DISABLE=y
+
+#
+# The following can be used to disable categories of
+# APIs supported by the OS. If the compiler supports
+# weak functions, then it should not be necessary to
+# disable functions unless you want to restrict usage
+# of those APIs.
+#
+# There are certain dependency relationships in these
+# features.
+#
+# o mq_notify logic depends on signals to awaken tasks
+# waiting for queues to become full or empty.
+# o pthread_condtimedwait() depends on signals to wake
+# up waiting tasks.
+#
+CONFIG_DISABLE_CLOCK=n
+CONFIG_DISABLE_POSIX_TIMERS=n
+CONFIG_DISABLE_PTHREAD=n
+CONFIG_DISABLE_SIGNALS=n
+CONFIG_DISABLE_MQUEUE=n
+CONFIG_DISABLE_MOUNTPOINT=n
+CONFIG_DISABLE_ENVIRON=n
+CONFIG_DISABLE_POLL=y
+
+#
+# Misc libc settings
+#
+# CONFIG_NOPRINTF_FIELDWIDTH - sprintf-related logic is a
+# little smaller if we do not support fieldwidthes
+#
+CONFIG_NOPRINTF_FIELDWIDTH=n
+
+#
+# Allow for architecture optimized implementations
+#
+# The architecture can provide optimized versions of the
+# following to improve sysem performance
+#
+CONFIG_ARCH_MEMCPY=y
+CONFIG_ARCH_MEMCMP=y
+CONFIG_ARCH_MEMMOVE=y
+CONFIG_ARCH_MEMSET=y
+CONFIG_ARCH_STRCMP=y
+CONFIG_ARCH_STRCPY=y
+CONFIG_ARCH_STRNCPY=y
+CONFIG_ARCH_STRLEN=y
+CONFIG_ARCH_STRNLEN=y
+CONFIG_ARCH_BZERO=n
+CONFIG_ARCH_MATH_H=y
+CONFIG_ARCH_STDINT_H=y
+CONFIG_ARCH_STDBOOL_H=y
+
+#
+# General build options
+#
+# CONFIG_RRLOAD_BINARY - make the rrload binary format used with
+# BSPs from www.ridgerun.com using the tools/mkimage.sh script
+# CONFIG_INTELHEX_BINARY - make the Intel HEX binary format
+# used with many different loaders using the GNU objcopy program
+# Should not be selected if you are not using the GNU toolchain.
+# CONFIG_RAW_BINARY - make a raw binary format file used with many
+# different loaders using the GNU objcopy program. This option
+# should not be selected if you are not using the GNU toolchain.
+# CONFIG_HAVE_LIBM - toolchain supports libm.a
+#
+CONFIG_RRLOAD_BINARY=n
+CONFIG_INTELHEX_BINARY=n
+CONFIG_RAW_BINARY=n
+CONFIG_HAVE_LIBM=n
+
+#
+# Sizes of configurable things (0 disables)
+#
+# CONFIG_MAX_TASKS - The maximum number of simultaneously
+# active tasks. This value must be a power of two.
+# CONFIG_MAX_TASK_ARGS - This controls the maximum number of
+# of parameters that a task may receive (i.e., maxmum value
+# of 'argc')
+# CONFIG_NPTHREAD_KEYS - The number of items of thread-
+# specific data that can be retained
+# CONFIG_NFILE_DESCRIPTORS - The maximum number of file
+# descriptors (one for each open)
+# CONFIG_NFILE_STREAMS - The maximum number of streams that
+# can be fopen'ed
+# CONFIG_NAME_MAX - The maximum size of a file name.
+# CONFIG_STDIO_BUFFER_SIZE - Size of the buffer to allocate
+# on fopen. (Only if CONFIG_NFILE_STREAMS > 0)
+# CONFIG_NUNGET_CHARS - Number of characters that can be
+# buffered by ungetc() (Only if CONFIG_NFILE_STREAMS > 0)
+# CONFIG_PREALLOC_MQ_MSGS - The number of pre-allocated message
+# structures. The system manages a pool of preallocated
+# message structures to minimize dynamic allocations
+# CONFIG_MQ_MAXMSGSIZE - Message structures are allocated with
+# a fixed payload size given by this settin (does not include
+# other message structure overhead.
+# CONFIG_MAX_WDOGPARMS - Maximum number of parameters that
+# can be passed to a watchdog handler
+# CONFIG_PREALLOC_WDOGS - The number of pre-allocated watchdog
+# structures. The system manages a pool of preallocated
+# watchdog structures to minimize dynamic allocations
+# CONFIG_PREALLOC_TIMERS - The number of pre-allocated POSIX
+# timer structures. The system manages a pool of preallocated
+# timer structures to minimize dynamic allocations. Set to
+# zero for all dynamic allocations.
+#
+CONFIG_MAX_TASKS=64
+CONFIG_MAX_TASK_ARGS=4
+CONFIG_NPTHREAD_KEYS=4
+CONFIG_NFILE_DESCRIPTORS=32
+CONFIG_NFILE_STREAMS=16
+CONFIG_NAME_MAX=32
+CONFIG_STDIO_BUFFER_SIZE=64
+CONFIG_NUNGET_CHARS=2
+CONFIG_PREALLOC_MQ_MSGS=32
+CONFIG_MQ_MAXMSGSIZE=32
+CONFIG_MAX_WDOGPARMS=4
+CONFIG_PREALLOC_WDOGS=32
+CONFIG_PREALLOC_TIMERS=8
+CONFIG_STDIO_LINEBUFFER=y
+
+#
+# FAT filesystem configuration
+# CONFIG_FS_FAT - Enable FAT filesystem support
+# CONFIG_FAT_SECTORSIZE - Max supported sector size
+# CONFIG_FS_ROMFS - Enable ROMFS filesystem support
+CONFIG_FS_FAT=n
+CONFIG_FS_ROMFS=n
+
+#
+# TCP/IP and UDP support via uIP
+# CONFIG_NET - Enable or disable all network features
+# CONFIG_NET_IPv6 - Build in support for IPv6
+# CONFIG_NSOCKET_DESCRIPTORS - Maximum number of socket descriptors per task/thread.
+# CONFIG_NET_SOCKOPTS - Enable or disable support for socket options
+# CONFIG_NET_BUFSIZE - uIP buffer size
+# CONFIG_NET_TCP - TCP support on or off
+# CONFIG_NET_TCP_CONNS - Maximum number of TCP connections (all tasks)
+# CONFIG_NET_TCP_READAHEAD_BUFSIZE - Size of TCP read-ahead buffers
+# CONFIG_NET_NTCP_READAHEAD_BUFFERS - Number of TCP read-ahead buffers (may be zero)
+# CONFIG_NET_TCPBACKLOG - Incoming connections pend in a backlog until
+# accept() is called. The size of the backlog is selected when listen() is called.
+# CONFIG_NET_MAX_LISTENPORTS - Maximum number of listening TCP ports (all tasks)
+# CONFIG_NET_UDP - UDP support on or off
+# CONFIG_NET_UDP_CHECKSUMS - UDP checksums on or off
+# CONFIG_NET_UDP_CONNS - The maximum amount of concurrent UDP connections
+# CONFIG_NET_ICMP - ICMP ping response support on or off
+# CONFIG_NET_ICMP_PING - ICMP ping request support on or off
+# CONFIG_NET_PINGADDRCONF - Use "ping" packet for setting IP address
+# CONFIG_NET_STATISTICS - uIP statistics on or off
+# CONFIG_NET_RECEIVE_WINDOW - The size of the advertised receiver's window
+# CONFIG_NET_ARPTAB_SIZE - The size of the ARP table
+# CONFIG_NET_BROADCAST - Broadcast support
+# CONFIG_NET_LLH_LEN - The link level header length
+# CONFIG_NET_FWCACHE_SIZE - number of packets to remember when looking for duplicates
+CONFIG_NET=y
+CONFIG_NET_IPv6=n
+CONFIG_NSOCKET_DESCRIPTORS=5
+CONFIG_NET_SOCKOPTS=y
+CONFIG_NET_BUFSIZE=1514
+CONFIG_NET_TCP=y
+CONFIG_NET_TCP_CONNS=40
+CONFIG_NET_MAX_LISTENPORTS=40
+CONFIG_NET_UDP=y
+CONFIG_NET_UDP_CHECKSUMS=y
+#CONFIG_NET_UDP_CONNS=10
+CONFIG_NET_ICMP=y
+CONFIG_NET_ICMP_PING=y
+#CONFIG_NET_PINGADDRCONF=0
+CONFIG_NET_STATISTICS=y
+CONFIG_NET_RECEIVE_WINDOW=128
+CONFIG_NET_ARPTAB_SIZE=8
+CONFIG_NET_BROADCAST=n
+#CONFIG_NET_LLH_LEN=14
+#CONFIG_NET_FWCACHE_SIZE=2
+
+#
+# UIP Network Utilities
+# CONFIG_NET_DHCP_LIGHT - Reduces size of DHCP
+# CONFIG_NET_RESOLV_ENTRIES - Number of resolver entries
+CONFIG_NET_DHCP_LIGHT=n
+CONFIG_NET_RESOLV_ENTRIES=4
+
+#
+# Settings for examples/uip
+CONFIG_EXAMPLE_UIP_IPADDR=(192<<24|168<<16|0<<8|128)
+CONFIG_EXAMPLE_UIP_DRIPADDR=(192<<24|168<<16|0<<8|1)
+CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0)
+CONFIG_EXAMPLE_UIP_DHCPC=n
+
+#
+# Settings for examples/nettest
+CONFIG_EXAMPLE_NETTEST_SERVER=n
+CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
+CONFIG_EXAMPLE_NETTEST_NOMAC=n
+CONFIG_EXAMPLE_NETTEST_IPADDR=(192<<24|168<<16|0<<8|128)
+CONFIG_EXAMPLE_NETTEST_DRIPADDR=(192<<24|168<<16|0<<8|1)
+CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0)
+CONFIG_EXAMPLE_NETTEST_CLIENTIP=(192<<24|168<<16|0<<8|106)
+
+#
+# Settings for apps/nshlib
+#
+# CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
+# CONFIG_NSH_STRERROR - Use strerror(errno)
+# CONFIG_NSH_LINELEN - Maximum length of one command line
+# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
+# CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
+# CONFIG_NSH_DISABLESCRIPT - Disable scripting support
+# CONFIG_NSH_DISABLEBG - Disable background commands
+# CONFIG_NSH_ROMFSETC - Use startup script in /etc
+# CONFIG_NSH_CONSOLE - Use serial console front end
+# CONFIG_NSH_TELNET - Use telnetd console front end
+#
+# If CONFIG_NSH_TELNET is selected:
+# CONFIG_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
+# CONFIG_NSH_DHCPC - Obtain address using DHCP
+# CONFIG_NSH_IPADDR - Provides static IP address
+# CONFIG_NSH_DRIPADDR - Provides static router IP address
+# CONFIG_NSH_NETMASK - Provides static network mask
+# CONFIG_NSH_NOMAC - Use a bogus MAC address
+#
+# If CONFIG_NSH_ROMFSETC is selected:
+# CONFIG_NSH_ROMFSMOUNTPT - ROMFS mountpoint
+# CONFIG_NSH_INITSCRIPT - Relative path to init script
+# CONFIG_NSH_ROMFSDEVNO - ROMFS RAM device minor
+# CONFIG_NSH_ROMFSSECTSIZE - ROMF sector size
+# CONFIG_NSH_FATDEVNO - FAT FS RAM device minor
+# CONFIG_NSH_FATSECTSIZE - FAT FS sector size
+# CONFIG_NSH_FATNSECTORS - FAT FS number of sectors
+# CONFIG_NSH_FATMOUNTPT - FAT FS mountpoint
+#
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_CMD_SIZE=40
+CONFIG_NSH_STACKSIZE=4096
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=n
+CONFIG_NSH_IPADDR=(192<<24|168<<16|10<<8|2)
+CONFIG_NSH_DRIPADDR=(192<<24|168<<16|10<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+
+#
+# Stack and heap information
+#
+# CONFIG_BOOT_RUNFROMFLASH - Some configurations support XIP
+# operation from FLASH but must copy initialized .data sections to RAM.
+# CONFIG_BOOT_COPYTORAM - Some configurations boot in FLASH
+# but copy themselves entirely into RAM for better performance.
+# CONFIG_CUSTOM_STACK - The up_ implementation will handle
+# all stack operations outside of the nuttx model.
+# CONFIG_STACK_POINTER - The initial stack pointer
+# CONFIG_IDLETHREAD_STACKSIZE - The size of the initial stack.
+# This is the thread that (1) performs the inital boot of the system up
+# to the point where user_start() is spawned, and (2 after is the
+# IDLE thread that executes only when there is no other thread ready to
+# run.
+# CONFIG_USERMAIN_STACKSIZE - The size of the stack to allocate
+# for the main user thread that begins at the user_start() entry point.
+# CONFIG_PTHREAD_STACK_MIN - Minimum pthread stack size
+# CONFIG_PTHREAD_STACK_DEFAULT - Default pthread stack size
+# CONFIG_HEAP_BASE - The beginning of the heap
+# CONFIG_HEAP_SIZE - The size of the heap
+#
+CONFIG_BOOT_RUNFROMFLASH=n
+CONFIG_BOOT_COPYTORAM=n
+CONFIG_CUSTOM_STACK=n
+CONFIG_IDLETHREAD_STACKSIZE=4096
+CONFIG_USERMAIN_STACKSIZE=4096
+CONFIG_PTHREAD_STACK_MIN=256
+CONFIG_PTHREAD_STACK_DEFAULT=8192
+CONFIG_HEAP_BASE=
+CONFIG_HEAP_SIZE=
+
+
+##########################################
+# RGMP specific configuration
+##########################################
+
+#
+# arch
+#
+CONFIG_RGMP_SUBARCH=arm
+
+#
+# VNET
+#
+CONFIG_NET_VNET=y
+CONFIG_VNET_NINTERFACES=1
+
+
diff --git a/configs/rgmp/nsh/setenv.sh b/configs/rgmp/arm/nsh/setenv.sh
old mode 100755
new mode 100644
similarity index 100%
rename from configs/rgmp/nsh/setenv.sh
rename to configs/rgmp/arm/nsh/setenv.sh
diff --git a/configs/rgmp/include/stdarg.h b/configs/rgmp/include/stdarg.h
index 8f879a819ebf27967be670d36c96e75e9a261655..b748243d155f26e4e54ab596a82d6a5c07898b9d 100755
--- a/configs/rgmp/include/stdarg.h
+++ b/configs/rgmp/include/stdarg.h
@@ -1,23 +1,8 @@
-#ifndef _RGMP_STDARG_H
-#define _RGMP_STDARG_H
+#ifndef _CONFIG_RGMP_STDARG_H
+#define _CONFIG_RGMP_STDARG_H
-typedef char *va_list;
-#define __va_size(type) \
- (((sizeof(type) + sizeof(long) - 1) / sizeof(long)) * sizeof(long))
+#include <rgmp/stdarg.h>
-#ifndef va_start
-#define va_start(ap, last) \
- ((ap) = (va_list)&(last) + __va_size(last))
-#endif
-
-#ifndef va_arg
-#define va_arg(ap, type) \
- (*(type *)((ap) += __va_size(type), (ap) - __va_size(type)))
-#endif
-
-#ifndef va_end
-#define va_end(ap) ((void)0)
-#endif
#endif
diff --git a/configs/rgmp/default/Make.defs b/configs/rgmp/x86/default/Make.defs
similarity index 96%
rename from configs/rgmp/default/Make.defs
rename to configs/rgmp/x86/default/Make.defs
index 1e104d76dca61656516c4c8aa4f2f72db7503987..c5e7c532fb105d234e42325e295518be8295afb4 100644
--- a/configs/rgmp/default/Make.defs
+++ b/configs/rgmp/x86/default/Make.defs
@@ -39,7 +39,7 @@ include ${TOPDIR}/.config
RGMPLIBDIR := $(RGMP_INST_DIR)/lib
RGMPINCDIR := $(RGMP_INST_DIR)/include
-RGMPLKSCPT := $(RGMP_INST_DIR)/etc/x86.ld
+RGMPLKSCPT := $(RGMP_INST_DIR)/etc/rgmp.ld
HOSTOS = ${shell uname -o}
@@ -54,7 +54,7 @@ ARCHPICFLAGS = -fpic
ARCHWARNINGS = -Wall -Wstrict-prototypes -Wshadow
ARCHDEFINES =
ARCHINCLUDES = -I. -isystem $(TOPDIR)/include -I$(RGMPINCDIR) \
- -I$(TOPDIR)/configs/rgmp/include
+ -I$(TOPDIR)/configs/rgmp/include -I$(TOPDIR)/arch/rgmp/include/x86
ARCHSCRIPT =
CROSSDEV =
@@ -80,9 +80,6 @@ else
EXEEXT =
endif
-ifeq ("${CONFIG_DEBUG_SYMBOLS}","y")
- LDFLAGS += -g
-endif
LDFLAGS += -nostdlib
EXTRA_LIBS =
diff --git a/configs/rgmp/x86/default/appconfig b/configs/rgmp/x86/default/appconfig
new file mode 100644
index 0000000000000000000000000000000000000000..e1397db204f0b6d4de91322d7d33e526c707897f
--- /dev/null
+++ b/configs/rgmp/x86/default/appconfig
@@ -0,0 +1,39 @@
+############################################################################
+# configs/sim/default/appconfig
+#
+# Copyright (C) 2011 Gregory Nutt. All rights reserved.
+# Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in
+# the documentation and/or other materials provided with the
+# distribution.
+# 3. Neither the name NuttX nor the names of its contributors may be
+# used to endorse or promote products derived from this software
+# without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+############################################################################
+
+# Path to example in apps/examples containing the user_start entry point
+
+CONFIGURED_APPS += examples/rgmp
+
diff --git a/configs/rgmp/default/defconfig b/configs/rgmp/x86/default/defconfig
similarity index 99%
rename from configs/rgmp/default/defconfig
rename to configs/rgmp/x86/default/defconfig
index 198a0ddcb522f7f244d5c4f88c6c75b4781e078b..0e07b7f075ab81110a7919f0a2bd0f8e7b45d69b 100644
--- a/configs/rgmp/default/defconfig
+++ b/configs/rgmp/x86/default/defconfig
@@ -389,6 +389,11 @@ CONFIG_HEAP_SIZE=
# RGMP specific configuration
##########################################
+#
+# arch
+#
+CONFIG_RGMP_SUBARCH=x86
+
#
# VNET
#
diff --git a/configs/rgmp/x86/default/setenv.sh b/configs/rgmp/x86/default/setenv.sh
new file mode 100644
index 0000000000000000000000000000000000000000..a6a533e477cc29970cdc716f5fb7c581020b9dd8
--- /dev/null
+++ b/configs/rgmp/x86/default/setenv.sh
@@ -0,0 +1,47 @@
+#!/bin/bash
+# config/rgmp/default/setenv.sh
+#
+# Copyright (C) 2011 Yu Qiang. All rights reserved.
+# Copyright (C) 2011 Gregory Nutt. All rights reserved.
+# Authors: Yu Qiang <yuq825@gmail.com>
+# Gregory Nutt <spudmonkey@racsa.co.cr>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in
+# the documentation and/or other materials provided with the
+# distribution.
+# 3. Neither the name NuttX nor the names of its contributors may be
+# used to endorse or promote products derived from this software
+# without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+
+if [ "$(basename $0)" = "setenv.sh" ] ; then
+ echo "You must source this script, not run it!" 1>&2
+ exit 1
+fi
+
+if [ -z ${PATH_ORIG} ]; then export PATH_ORIG=${PATH}; fi
+
+#export NUTTX_BIN=
+#export PATH=${NUTTX_BIN}:/sbin:/usr/sbin:${PATH_ORIG}
+
+echo "PATH : ${PATH}"
diff --git a/configs/rgmp/nsh/Make.defs b/configs/rgmp/x86/nsh/Make.defs
similarity index 96%
rename from configs/rgmp/nsh/Make.defs
rename to configs/rgmp/x86/nsh/Make.defs
index 41073c249a9281a66a875a1a59aca7b413c94bfb..22d29c35a8d658d0cec03fa648c7b6d48a450f6d 100644
--- a/configs/rgmp/nsh/Make.defs
+++ b/configs/rgmp/x86/nsh/Make.defs
@@ -39,7 +39,7 @@ include ${TOPDIR}/.config
RGMPLIBDIR := $(RGMP_INST_DIR)/lib
RGMPINCDIR := $(RGMP_INST_DIR)/include
-RGMPLKSCPT := $(RGMP_INST_DIR)/etc/x86.ld
+RGMPLKSCPT := $(RGMP_INST_DIR)/etc/rgmp.ld
HOSTOS = ${shell uname -o}
@@ -54,7 +54,7 @@ ARCHPICFLAGS = -fpic
ARCHWARNINGS = -Wall -Wstrict-prototypes -Wshadow
ARCHDEFINES =
ARCHINCLUDES = -I. -isystem $(TOPDIR)/include -I$(RGMPINCDIR) \
- -I$(TOPDIR)/configs/rgmp/include
+ -I$(TOPDIR)/configs/rgmp/include -I$(TOPDIR)/arch/rgmp/include/x86
ARCHSCRIPT =
CROSSDEV =
@@ -80,9 +80,6 @@ else
EXEEXT =
endif
-ifeq ("${CONFIG_DEBUG_SYMBOLS}","y")
- LDFLAGS += -g
-endif
LDFLAGS += -nostdlib
EXTRA_LIBS =
diff --git a/configs/rgmp/x86/nsh/appconfig b/configs/rgmp/x86/nsh/appconfig
new file mode 100644
index 0000000000000000000000000000000000000000..092554129e9f460f7a98a5d4ec424e68b9d59a09
--- /dev/null
+++ b/configs/rgmp/x86/nsh/appconfig
@@ -0,0 +1,54 @@
+############################################################################
+# configs/rgmp/nsh/appconfig
+#
+# Copyright (C) 2011 Gregory Nutt. All rights reserved.
+# Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in
+# the documentation and/or other materials provided with the
+# distribution.
+# 3. Neither the name NuttX nor the names of its contributors may be
+# used to endorse or promote products derived from this software
+# without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+############################################################################
+
+# Path to example in apps/examples containing the user_start entry point
+
+CONFIGURED_APPS += examples/nsh
+
+# The NSH Library
+
+CONFIGURED_APPS += nshlib
+
+# Networking support
+
+ifeq ($(CONFIG_NET),y)
+CONFIGURED_APPS += netutils/uiplib
+CONFIGURED_APPS += netutils/dhcpc
+CONFIGURED_APPS += netutils/resolv
+CONFIGURED_APPS += netutils/tftpc
+CONFIGURED_APPS += netutils/webclient
+endif
+
+
diff --git a/configs/rgmp/nsh/defconfig b/configs/rgmp/x86/nsh/defconfig
similarity index 99%
rename from configs/rgmp/nsh/defconfig
rename to configs/rgmp/x86/nsh/defconfig
index 081204024d28ef431cb9fd81b17d76d6fbda0097..89bc4664355627c8d0260041b1f5704acd9ee5b6 100644
--- a/configs/rgmp/nsh/defconfig
+++ b/configs/rgmp/x86/nsh/defconfig
@@ -419,6 +419,11 @@ CONFIG_HEAP_SIZE=
# RGMP specific configuration
##########################################
+#
+# arch
+#
+CONFIG_RGMP_SUBARCH=x86
+
#
# VNET
#
diff --git a/configs/rgmp/x86/nsh/setenv.sh b/configs/rgmp/x86/nsh/setenv.sh
new file mode 100644
index 0000000000000000000000000000000000000000..6caf8de84b4aca20386ba1521b166b0c570feeb5
--- /dev/null
+++ b/configs/rgmp/x86/nsh/setenv.sh
@@ -0,0 +1,47 @@
+#!/bin/bash
+# config/rgmp/nsh/setenv.sh
+#
+# Copyright (C) 2011 Yu Qiang. All rights reserved.
+# Copyright (C) 2011 Gregory Nutt. All rights reserved.
+# Authors: Yu Qiang <yuq825@gmail.com>
+# Gregory Nutt <spudmonkey@racsa.co.cr>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in
+# the documentation and/or other materials provided with the
+# distribution.
+# 3. Neither the name NuttX nor the names of its contributors may be
+# used to endorse or promote products derived from this software
+# without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+
+if [ "$(basename $0)" = "setenv.sh" ] ; then
+ echo "You must source this script, not run it!" 1>&2
+ exit 1
+fi
+
+if [ -z ${PATH_ORIG} ]; then export PATH_ORIG=${PATH}; fi
+
+#export NUTTX_BIN=
+#export PATH=${NUTTX_BIN}:/sbin:/usr/sbin:${PATH_ORIG}
+
+echo "PATH : ${PATH}"
diff --git a/drivers/net/e1000.c b/drivers/net/e1000.c
index 481c2123ebe97b61f2d007c7a96c92963bb37ee2..ce6192ac0ee4bc86aef5267243dfdd2eff0485ce 100644
--- a/drivers/net/e1000.c
+++ b/drivers/net/e1000.c
@@ -58,10 +58,10 @@
#include <net/uip/uip-arch.h>
#include <rgmp/pmap.h>
-#include <rgmp/pci.h>
#include <rgmp/string.h>
-#include <rgmp/x86.h>
#include <rgmp/stdio.h>
+#include <rgmp/arch/pci.h>
+#include <rgmp/memio.h>
#include "e1000.h"
/****************************************************************************
diff --git a/drivers/net/e1000.h b/drivers/net/e1000.h
index 04f986fef48c1c9f53d13012027bf14ff7702b4b..6614ad77ecf46b8d7995326e69c5c2098fdbe376 100644
--- a/drivers/net/e1000.h
+++ b/drivers/net/e1000.h
@@ -46,7 +46,7 @@
#include <rgmp/types.h>
#include <rgmp/trap.h>
-#include <rgmp/x86.h>
+#include <rgmp/arch/arch.h>
/****************************************************************************
* Pre-processor Definitions