Auto-configuration updates from Richard Cochran

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5032 42af7a65-404d-4744-a932-0658087f49c3

8 files changed, 85 insertions, 22 deletions

diff --git a/nuttx/arch/Kconfig b/nuttx/arch/Kconfig
index 6e0e0fb9d..fea56b739 100644
--- a/nuttx/arch/Kconfig
+++ b/nuttx/arch/Kconfig
@@ -19,11 +19,13 @@ config ARCH_ARM
 
 config ARCH_AVR
 	bool "AVR"
+	select ARCH_NOINTC
 	---help---
 		Atmel 8-bit bit AVR and 32-bit AVR32 architectures
 
 config ARCH_HC
 	bool "Freescale HC"
+	select ARCH_NOINTC
 	---help---
 		Freescale HC architectures (M9S12)
 
@@ -39,7 +41,8 @@ config ARCH_RGMP
 		http://rgmp.sourceforge.net/wiki/index.php/Main_Page.
 
 config ARCH_SH
-	bool "Rensas"
+	bool "Renesas"
+	select ARCH_NOINTC
 	---help---
 		Renesas architectures (SH and M16C).
 
@@ -90,3 +93,35 @@ source arch/sim/Kconfig
 source arch/x86/Kconfig
 source arch/z16/Kconfig
 source arch/z80/Kconfig
+
+comment "Architecture Options"
+
+config ARCH_NOINTC
+	bool
+	default n
+
+config ARCH_STACKDUMP
+	bool "Dump stack on assertions"
+	default n
+	---help---
+		Enable to do stack dumps after assertions
+
+comment "Board Settings"
+
+config BOARD_LOOPSPERMSEC
+	int "Loops per millisecond"
+	help
+		Must be calibrated for correct operation of delay loops.
+		You simply use a stop watch to measure the 100 second delay
+		then adjust CONFIG_BOARD_LOOPSPERMSEC until it is actually
+		is 100 seconds.
+
+config DRAM_START
+	hex "DRAM start address"
+	help
+		The physical start address of installed RAM.
+
+config DRAM_SIZE
+	int "DRAM size"
+	help
+		The size in bytes of the installed RAM.
diff --git a/nuttx/arch/arm/Kconfig b/nuttx/arch/arm/Kconfig
index 40dcb1105..f587cc274 100644
--- a/nuttx/arch/arm/Kconfig
+++ b/nuttx/arch/arm/Kconfig
@@ -118,12 +118,6 @@ config ARCH_CHIP
 	default "stm32"		if ARCH_CHIP_STM32
 	default "str71x"	if ARCH_CHIP_STR71X
 
-config ARCH_STACKDUMP
-	bool "Dump stack on assertions"
-	default n
-	---help---
-		Enable to do stack dumps after assertions
-
 config ARCH_LEDS
 	bool "Use board LEDs to show state"
 	default y
diff --git a/nuttx/arch/avr/Kconfig b/nuttx/arch/avr/Kconfig
index c2ded9080..0fe839b79 100644
--- a/nuttx/arch/avr/Kconfig
+++ b/nuttx/arch/avr/Kconfig
@@ -4,6 +4,44 @@
 #
 
 if ARCH_AVR
+
+choice
+	prompt "Toolchain"
+	default AVR_BUILDROOT
+
+config AVR_WINAVR
+	bool "WinAVR"
+	---help---
+		For Cygwin development environment on Windows machines, you
+		can use WinAVR: http://sourceforge.net/projects/winavr/files/
+
+		It is assumed in some places that WinAVR is installed at
+		C:/WinAVR. Edit the setenv.sh file if this is not the case.
+
+		WARNING: There is an incompatible version of cygwin.dll in
+		the WinAVR/bin directory! Make sure that the path to the
+		correct cygwin.dll file precedes the path to the WinAVR
+		binaries!
+
+config AVR_LINUXGCC
+	bool "Linux GCC"
+	---help---
+		For Linux, there are widely available avr-gcc packages. On
+		Ubuntu, use: sudo apt-get install gcc-avr gdb-avr avr-libc
+
+config AVR_BUILDROOT
+	bool "Buildroot"
+	---help---
+		There is a DIY buildroot version for the AVR boards here:
+		http://sourceforge.net/projects/nuttx/files/buildroot/. See
+		the following section for details on building this toolchain.
+
+		It is assumed in some places that buildroot toolchain is
+		available at ../misc/buildroot/build_avr. Edit the setenv.sh
+		file if this is not the case.
+
+endchoice
+
 choice
 	prompt "Atmel AVR chip selection"
 	default ARCH_CHIP_AT32UC3B0256
@@ -65,7 +103,7 @@ config ARCH_AT32UC3
 	bool
 	default y			if ARCH_CHIP_AT32UC3B0256
 
-config ARCH
+config ARCH_CHIP
 	string
 	default "atmega"	if ARCH_ATMEGA
 	default "at90usb"	if ARCH_AT90USB
diff --git a/nuttx/arch/avr/src/atmega/atmega_lowinit.c b/nuttx/arch/avr/src/atmega/atmega_lowinit.c
index 8456f0e11..075a6413a 100644
--- a/nuttx/arch/avr/src/atmega/atmega_lowinit.c
+++ b/nuttx/arch/avr/src/atmega/atmega_lowinit.c
@@ -128,7 +128,7 @@ void up_lowinit(void)
 
   /* Set the system clock divider to 1 */
 
-  clock_prescale_set(clock_div_1);
+  XDIV = 0;
 
   /* Initialize the watchdog timer */
 
diff --git a/nuttx/arch/mips/Kconfig b/nuttx/arch/mips/Kconfig
index 36f7f4f86..001d03228 100644
--- a/nuttx/arch/mips/Kconfig
+++ b/nuttx/arch/mips/Kconfig
@@ -27,12 +27,6 @@ config ARCH_CHIP
 	string
 	default "pic32mx"	if ARCH_CHIP_PIC32MX
 
-config ARCH_STACKDUMP
-	bool "Dump stack on assertions"
-	default n
-	---help---
-		Enable to do stack dumps after assertions
-
 config ARCH_LEDS
 	bool "Use board LEDs to show state"
 	default y
diff --git a/nuttx/configs/amber/hello/defconfig b/nuttx/configs/amber/hello/defconfig
index 8c828544d..2b56cc003 100644
--- a/nuttx/configs/amber/hello/defconfig
+++ b/nuttx/configs/amber/hello/defconfig
@@ -1,8 +1,8 @@
 ############################################################################
 # configs/amber/hello/defconfig
 #
-#   Copyright (C) 2011 Gregory Nutt. All rights reserved.
-#   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+#   Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
+#   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -75,13 +75,12 @@
 CONFIG_ARCH=avr
 CONFIG_ARCH_AVR=y
 CONFIG_ARCH_ATMEGA=y
-CONFIG_ARCH_CHIP=atmega
+CONFIG_ARCH_CHIP="atmega"
 CONFIG_ARCH_CHIP_ATMEGA128=y
 CONFIG_ARCH_BOARD=amber
 CONFIG_ARCH_BOARD_AMBER=y
-CONFIG_BOARD_LOOPSPERMSEC=8079
-CONFIG_BOARD_LOOPSPERMSEC=(8*100)
-CONFIG_DRAM_SIZE=(4*1024)
+CONFIG_BOARD_LOOPSPERMSEC=800
+CONFIG_DRAM_SIZE=4096
 CONFIG_DRAM_START=0x800100
 CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE)
 CONFIG_ARCH_NOINTC=y
diff --git a/nuttx/drivers/sensors/Make.defs b/nuttx/drivers/sensors/Make.defs
index bd28ba070..d04e7541e 100644
--- a/nuttx/drivers/sensors/Make.defs
+++ b/nuttx/drivers/sensors/Make.defs
@@ -37,7 +37,10 @@
 # These drivers depend on I2C support
 
 ifeq ($(CONFIG_I2C),y)
+
+ifeq ($(CONFIG_I2C_TRANSFER),y)
   CSRCS += lis331dl.c
+endif
 
 ifeq ($(CONFIG_I2C_LM75),y)
   CSRCS += lm75.c
diff --git a/nuttx/sched/Kconfig b/nuttx/sched/Kconfig
index f82273638..9d7a38549 100644
--- a/nuttx/sched/Kconfig
+++ b/nuttx/sched/Kconfig
@@ -204,7 +204,7 @@ config SCHED_ONEXIT_MAX
 
 config DISABLE_OS_API
 	bool "Disable NuttX interfaces"
-	default n
+	default y
 	---help---
 	The following can be used to disable categories of
 	APIs supported by the OS.  If the compiler supports