configs/qemu-i486 update naming standards to conform to current thinking; refresh defconfig files

5 files changed, 59 insertions, 12 deletions

diff --git a/nuttx/configs/qemu-i486/nsh/defconfig b/nuttx/configs/qemu-i486/nsh/defconfig
index 404da7644..883ebb523 100644
--- a/nuttx/configs/qemu-i486/nsh/defconfig
+++ b/nuttx/configs/qemu-i486/nsh/defconfig
@@ -30,6 +30,7 @@ CONFIG_HOST_LINUX=y
 #
 # Customize Header Files
 #
+# CONFIG_ARCH_STDINT_H is not set
 # CONFIG_ARCH_STDBOOL_H is not set
 # CONFIG_ARCH_MATH_H is not set
 # CONFIG_ARCH_FLOAT_H is not set
@@ -82,6 +83,8 @@ CONFIG_ARCH_X86_HAVE_32BIT=y
 #
 # QEMU Configuration Options
 #
+# CONFIG_QEMU_KEYPAD is not set
+# CONFIG_QEMU_VGA is not set
 
 #
 # Architecture Options
@@ -264,10 +267,32 @@ CONFIG_16550_SUPRESS_CONFIG=y
 CONFIG_16550_REGINCR=1
 CONFIG_16550_REGWIDTH=8
 CONFIG_16550_ADDRWIDTH=16
+# CONFIG_ARCH_HAVE_UART is not set
+# CONFIG_ARCH_HAVE_UART0 is not set
+# CONFIG_ARCH_HAVE_UART1 is not set
+# CONFIG_ARCH_HAVE_UART2 is not set
+# CONFIG_ARCH_HAVE_UART3 is not set
+# CONFIG_ARCH_HAVE_UART4 is not set
+# CONFIG_ARCH_HAVE_UART5 is not set
+# CONFIG_ARCH_HAVE_UART6 is not set
+# CONFIG_ARCH_HAVE_UART7 is not set
+# CONFIG_ARCH_HAVE_UART8 is not set
+# CONFIG_ARCH_HAVE_SCI0 is not set
+# CONFIG_ARCH_HAVE_SCI1 is not set
+# CONFIG_ARCH_HAVE_USART0 is not set
+# CONFIG_ARCH_HAVE_USART1 is not set
+# CONFIG_ARCH_HAVE_USART2 is not set
+# CONFIG_ARCH_HAVE_USART3 is not set
+# CONFIG_ARCH_HAVE_USART4 is not set
+# CONFIG_ARCH_HAVE_USART5 is not set
+# CONFIG_ARCH_HAVE_USART6 is not set
+# CONFIG_ARCH_HAVE_USART7 is not set
+# CONFIG_ARCH_HAVE_USART8 is not set
 
 #
 # USART Configuration
 #
+# CONFIG_MCU_SERIAL is not set
 # CONFIG_STANDARD_SERIAL is not set
 # CONFIG_SERIAL_IFLOWCONTROL is not set
 # CONFIG_SERIAL_OFLOWCONTROL is not set
diff --git a/nuttx/configs/qemu-i486/ostest/defconfig b/nuttx/configs/qemu-i486/ostest/defconfig
index 553a525b9..ba1e12233 100644
--- a/nuttx/configs/qemu-i486/ostest/defconfig
+++ b/nuttx/configs/qemu-i486/ostest/defconfig
@@ -30,6 +30,7 @@ CONFIG_HOST_LINUX=y
 #
 # Customize Header Files
 #
+# CONFIG_ARCH_STDINT_H is not set
 # CONFIG_ARCH_STDBOOL_H is not set
 # CONFIG_ARCH_MATH_H is not set
 # CONFIG_ARCH_FLOAT_H is not set
@@ -82,6 +83,8 @@ CONFIG_ARCH_X86_HAVE_32BIT=y
 #
 # QEMU Configuration Options
 #
+# CONFIG_QEMU_KEYPAD is not set
+# CONFIG_QEMU_VGA is not set
 
 #
 # Architecture Options
@@ -242,10 +245,32 @@ CONFIG_DEV_NULL=y
 CONFIG_SERIAL=y
 CONFIG_DEV_LOWCONSOLE=y
 # CONFIG_16550_UART is not set
+# CONFIG_ARCH_HAVE_UART is not set
+# CONFIG_ARCH_HAVE_UART0 is not set
+# CONFIG_ARCH_HAVE_UART1 is not set
+# CONFIG_ARCH_HAVE_UART2 is not set
+# CONFIG_ARCH_HAVE_UART3 is not set
+# CONFIG_ARCH_HAVE_UART4 is not set
+# CONFIG_ARCH_HAVE_UART5 is not set
+# CONFIG_ARCH_HAVE_UART6 is not set
+# CONFIG_ARCH_HAVE_UART7 is not set
+# CONFIG_ARCH_HAVE_UART8 is not set
+# CONFIG_ARCH_HAVE_SCI0 is not set
+# CONFIG_ARCH_HAVE_SCI1 is not set
+# CONFIG_ARCH_HAVE_USART0 is not set
+# CONFIG_ARCH_HAVE_USART1 is not set
+# CONFIG_ARCH_HAVE_USART2 is not set
+# CONFIG_ARCH_HAVE_USART3 is not set
+# CONFIG_ARCH_HAVE_USART4 is not set
+# CONFIG_ARCH_HAVE_USART5 is not set
+# CONFIG_ARCH_HAVE_USART6 is not set
+# CONFIG_ARCH_HAVE_USART7 is not set
+# CONFIG_ARCH_HAVE_USART8 is not set
 
 #
 # USART Configuration
 #
+# CONFIG_MCU_SERIAL is not set
 # CONFIG_SERIAL_IFLOWCONTROL is not set
 # CONFIG_SERIAL_OFLOWCONTROL is not set
 # CONFIG_USBDEV is not set
diff --git a/nuttx/configs/qemu-i486/src/Makefile b/nuttx/configs/qemu-i486/src/Makefile
index e7e9f117b..61768bf97 100644
--- a/nuttx/configs/qemu-i486/src/Makefile
+++ b/nuttx/configs/qemu-i486/src/Makefile
@@ -38,7 +38,7 @@
 CFLAGS		+= -I$(TOPDIR)/sched
 
 ASRCS		= 
-CSRCS		= up_boot.c
+CSRCS		= qemu_boot.c
 
 AOBJS		= $(ASRCS:.S=$(OBJEXT))
 COBJS		= $(CSRCS:.c=$(OBJEXT))
diff --git a/nuttx/configs/qemu-i486/src/up_boot.c b/nuttx/configs/qemu-i486/src/qemu_boot.c
index 391f8f2ad..4d2062956 100644
--- a/nuttx/configs/qemu-i486/src/up_boot.c
+++ b/nuttx/configs/qemu-i486/src/qemu_boot.c
@@ -1,8 +1,7 @@
 /************************************************************************************
- * configs/qemu-i486/src/up_boot.c
- * arch/x86/src/board/up_boot.c
+ * configs/qemu-i486/src/qemu_boot.c
  *
- *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2011, 2014 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -48,7 +47,7 @@
 #include "up_internal.h"
 
 #include "qemu_internal.h"
-#include "qemui486_internal.h"
+#include "qemu_i486.h"
 
 /************************************************************************************
  * Definitions
diff --git a/nuttx/configs/qemu-i486/src/qemui486_internal.h b/nuttx/configs/qemu-i486/src/qemu_i486.h
index 6a0466149..66d0734d6 100644
--- a/nuttx/configs/qemu-i486/src/qemui486_internal.h
+++ b/nuttx/configs/qemu-i486/src/qemu_i486.h
@@ -1,8 +1,7 @@
 /************************************************************************************
- * configs/qemu-i486/src/qemui486_internal.h
- * arch/x86/src/board/qemui486_internal.n
+ * configs/qemu-i486/src/qemu_i486.h
  *
- *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2011, 2014 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -34,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef _CONFIGS_QEMU_I486_SRC_QEMUI486_INTERNAL_H
-#define _CONFIGS_QEMU_I486_SRC_QEMUI486_INTERNAL_H
+#ifndef _CONFIGS_QEMU_I486_SRC_QEMU_I486_H
+#define _CONFIGS_QEMU_I486_SRC_QEMU_I486_H
 
 /************************************************************************************
  * Included Files
@@ -65,5 +64,4 @@
  ************************************************************************************/
 
 #endif /* __ASSEMBLY__ */
-#endif /* _CONFIGS_QEMU_I486_SRC_QEMUI486_INTERNAL_H */
-
+#endif /* _CONFIGS_QEMU_I486_SRC_QEMU_I486_H */