From aed6cd88cd81d2bfb1e7f032fa97f7431aaed33a Mon Sep 17 00:00:00 2001
From: patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>
Date: Fri, 17 Aug 2012 14:07:48 +0000
Subject: Auto-configuration updates from Richard Cochran

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5032 42af7a65-404d-4744-a932-0658087f49c3
---
 nuttx/arch/avr/Kconfig                     | 40 +++++++++++++++++++++++++++++-
 nuttx/arch/avr/src/atmega/atmega_lowinit.c |  2 +-
 2 files changed, 40 insertions(+), 2 deletions(-)

(limited to 'nuttx/arch/avr')

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 */
 
-- 
cgit v1.2.3