Lots of defconfig changes for compatibility with the configuration tool

git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@5050 7fd9a85b-ad96-42d3-883c-3090e2eb8679

4 files changed, 52 insertions, 52 deletions

diff --git a/nuttx/configs/teensy/hello/defconfig b/nuttx/configs/teensy/hello/defconfig
index dc5e58d650..897954923c 100644
--- a/nuttx/configs/teensy/hello/defconfig
+++ b/nuttx/configs/teensy/hello/defconfig
@@ -71,15 +71,15 @@
 #   the delay actually is 100 seconds.
 # CONFIG_ARCH_DMA - Support DMA initialization
 #
-CONFIG_ARCH=avr
+CONFIG_ARCH="avr"
 CONFIG_ARCH_AVR=y
 CONFIG_ARCH_AT90USB=y
-CONFIG_ARCH_CHIP=at90usb
+CONFIG_ARCH_CHIP="at90usb"
 CONFIG_ARCH_CHIP_AT90USB1286=y
-CONFIG_ARCH_BOARD=teensy
+CONFIG_ARCH_BOARD="teensy"
 CONFIG_ARCH_BOARD_TEENSY=y
-CONFIG_BOARD_LOOPSPERMSEC=(8*108)
-CONFIG_DRAM_SIZE=(8*1024)
+CONFIG_BOARD_LOOPSPERMSEC=864
+CONFIG_DRAM_SIZE=8192
 CONFIG_DRAM_START=0x800100
 CONFIG_ARCH_NOINTC=y
 CONFIG_ARCH_IRQPRIO=n
@@ -250,7 +250,7 @@ CONFIG_HAVE_LIBM=n
 # CONFIG_SCHED_WORKPRIORITY - The execution priority of the worker
 #  thread.  Default: 50
 # CONFIG_SCHED_WORKPERIOD - How often the worker thread checks for
-#  work in units of microseconds.  Default: 50*1000 (50 MS).
+#  work in units of microseconds.  Default: 50000 (50 MS).
 # CONFIG_SCHED_WORKSTACKSIZE - The stack size allocated for the worker
 #  thread.  Default: CONFIG_IDLETHREAD_STACKSIZE.
 # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up
@@ -282,7 +282,7 @@ CONFIG_FDCLONE_STDIO=n
 CONFIG_SDCLONE_DISABLE=y
 CONFIG_SCHED_WORKQUEUE=n
 CONFIG_SCHED_WORKPRIORITY=50
-CONFIG_SCHED_WORKPERIOD=(50*1000)
+CONFIG_SCHED_WORKPERIOD=50000
 CONFIG_SCHED_WORKSTACKSIZE=1024
 CONFIG_SIG_SIGWORK=4
 
@@ -608,9 +608,9 @@ CONFIG_USBMSC_REMOVABLE=y
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0)
+CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
+CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
+CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
 CONFIG_EXAMPLE_UIP_DHCPC=n
 
 #
@@ -632,10 +632,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n
 CONFIG_EXAMPLE_NETTEST_SERVER=n
 CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
 CONFIG_EXAMPLE_NETTEST_NOMAC=y
-CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0)
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1)
+CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
+CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
+CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
+CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
 
 #
 # Settings for examples/ostest
@@ -690,9 +690,9 @@ CONFIG_NSH_ARCHINIT=n
 CONFIG_NSH_IOBUFFER_SIZE=512
 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)
+CONFIG_NSH_IPADDR=0x0a000002
+CONFIG_NSH_DRIPADDR=0x0a000001
+CONFIG_NSH_NETMASK=0xffffff00
 CONFIG_NSH_ROMFSMOUNTPT="/etc"
 CONFIG_NSH_INITSCRIPT="init.d/rcS"
 CONFIG_NSH_ROMFSDEVNO=0
diff --git a/nuttx/configs/teensy/nsh/defconfig b/nuttx/configs/teensy/nsh/defconfig
index 68c2c97f5e..5325d0e7d5 100755
--- a/nuttx/configs/teensy/nsh/defconfig
+++ b/nuttx/configs/teensy/nsh/defconfig
@@ -71,15 +71,15 @@
 #   the delay actually is 100 seconds.
 # CONFIG_ARCH_DMA - Support DMA initialization
 #
-CONFIG_ARCH=avr
+CONFIG_ARCH="avr"
 CONFIG_ARCH_AVR=y
 CONFIG_ARCH_AT90USB=y
-CONFIG_ARCH_CHIP=at90usb
+CONFIG_ARCH_CHIP="at90usb"
 CONFIG_ARCH_CHIP_AT90USB1286=y
-CONFIG_ARCH_BOARD=teensy
+CONFIG_ARCH_BOARD="teensy"
 CONFIG_ARCH_BOARD_TEENSY=y
-CONFIG_BOARD_LOOPSPERMSEC=(8*108)
-CONFIG_DRAM_SIZE=(8*1024)
+CONFIG_BOARD_LOOPSPERMSEC=864
+CONFIG_DRAM_SIZE=8192
 CONFIG_DRAM_START=0x800100
 CONFIG_ARCH_NOINTC=y
 CONFIG_ARCH_IRQPRIO=n
@@ -253,7 +253,7 @@ CONFIG_HAVE_LIBM=n
 # CONFIG_SCHED_WORKPRIORITY - The execution priority of the worker
 #  thread.  Default: 50
 # CONFIG_SCHED_WORKPERIOD - How often the worker thread checks for
-#  work in units of microseconds.  Default: 50*1000 (50 MS).
+#  work in units of microseconds.  Default: 50000 (50 MS).
 # CONFIG_SCHED_WORKSTACKSIZE - The stack size allocated for the worker
 #  thread.  Default: CONFIG_IDLETHREAD_STACKSIZE.
 # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up
@@ -285,7 +285,7 @@ CONFIG_FDCLONE_STDIO=n
 CONFIG_SDCLONE_DISABLE=y
 CONFIG_SCHED_WORKQUEUE=n
 CONFIG_SCHED_WORKPRIORITY=50
-CONFIG_SCHED_WORKPERIOD=(50*1000)
+CONFIG_SCHED_WORKPERIOD=50000
 CONFIG_SCHED_WORKSTACKSIZE=1024
 CONFIG_SIG_SIGWORK=4
 
@@ -637,9 +637,9 @@ CONFIG_USBMSC_REMOVABLE=y
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0)
+CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
+CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
+CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
 CONFIG_EXAMPLE_UIP_DHCPC=n
 
 #
@@ -660,10 +660,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n
 CONFIG_EXAMPLE_NETTEST_SERVER=n
 CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
 CONFIG_EXAMPLE_NETTEST_NOMAC=y
-CONFIG_EXAMPLE_NETTEST_IPADDR=(10L<<24|0L<<16|0L<<8|2L)
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10L<<24|0L<<16|0L<<8|1L)
-CONFIG_EXAMPLE_NETTEST_NETMASK=(255L<<24|255L<<16|255L<<8|0L)
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10L<<24|0L<<16|0L<<8|1L)
+CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
+CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
+CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
+CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
 
 #
 # Settings for examples/ostest
@@ -718,9 +718,9 @@ CONFIG_NSH_ARCHINIT=n
 CONFIG_NSH_IOBUFFER_SIZE=512
 CONFIG_NSH_DHCPC=n
 CONFIG_NSH_NOMAC=y
-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)
+CONFIG_NSH_IPADDR=0x0a000002
+CONFIG_NSH_DRIPADDR=0x0a000001
+CONFIG_NSH_NETMASK=0xffffff00
 CONFIG_NSH_ROMFSMOUNTPT="/etc"
 CONFIG_NSH_INITSCRIPT="init.d/rcS"
 CONFIG_NSH_ROMFSDEVNO=0
diff --git a/nuttx/configs/teensy/src/up_spi.c b/nuttx/configs/teensy/src/up_spi.c
index 2ef0908f2a..e3284be081 100644
--- a/nuttx/configs/teensy/src/up_spi.c
+++ b/nuttx/configs/teensy/src/up_spi.c
@@ -50,7 +50,7 @@
 

 #include "up_arch.h"

 #include "chip.h"

-#include "at90Usb_internal.h"

+#include "at90usb_internal.h"

 #include "teensy_internal.h"

 

 #ifdef CONFIG_AVR_SPI

diff --git a/nuttx/configs/teensy/usbstorage/defconfig b/nuttx/configs/teensy/usbstorage/defconfig
index 570c7f881b..7972993b73 100755
--- a/nuttx/configs/teensy/usbstorage/defconfig
+++ b/nuttx/configs/teensy/usbstorage/defconfig
@@ -71,15 +71,15 @@
 #   the delay actually is 100 seconds.
 # CONFIG_ARCH_DMA - Support DMA initialization
 #
-CONFIG_ARCH=avr
+CONFIG_ARCH="avr"
 CONFIG_ARCH_AVR=y
 CONFIG_ARCH_AT90USB=y
-CONFIG_ARCH_CHIP=at90usb
+CONFIG_ARCH_CHIP="at90usb"
 CONFIG_ARCH_CHIP_AT90USB1286=y
-CONFIG_ARCH_BOARD=teensy
+CONFIG_ARCH_BOARD="teensy"
 CONFIG_ARCH_BOARD_TEENSY=y
-CONFIG_BOARD_LOOPSPERMSEC=(8*108)
-CONFIG_DRAM_SIZE=(8*1024)
+CONFIG_BOARD_LOOPSPERMSEC=864
+CONFIG_DRAM_SIZE=8192
 CONFIG_DRAM_START=0x800100
 CONFIG_ARCH_NOINTC=y
 CONFIG_ARCH_IRQPRIO=n
@@ -250,7 +250,7 @@ CONFIG_HAVE_LIBM=n
 # CONFIG_SCHED_WORKPRIORITY - The execution priority of the worker
 #  thread.  Default: 50
 # CONFIG_SCHED_WORKPERIOD - How often the worker thread checks for
-#  work in units of microseconds.  Default: 50*1000 (50 MS).
+#  work in units of microseconds.  Default: 50000 (50 MS).
 # CONFIG_SCHED_WORKSTACKSIZE - The stack size allocated for the worker
 #  thread.  Default: CONFIG_IDLETHREAD_STACKSIZE.
 # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up
@@ -282,7 +282,7 @@ CONFIG_FDCLONE_STDIO=n
 CONFIG_SDCLONE_DISABLE=y
 CONFIG_SCHED_WORKQUEUE=n
 CONFIG_SCHED_WORKPRIORITY=50
-CONFIG_SCHED_WORKPERIOD=(50*1000)
+CONFIG_SCHED_WORKPERIOD=50000
 CONFIG_SCHED_WORKSTACKSIZE=1024
 CONFIG_SIG_SIGWORK=4
 
@@ -641,9 +641,9 @@ CONFIG_USBMSC_REMOVABLE=y
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0)
+CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
+CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
+CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
 CONFIG_EXAMPLE_UIP_DHCPC=n
 
 #
@@ -664,10 +664,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n
 CONFIG_EXAMPLE_NETTEST_SERVER=n
 CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
 CONFIG_EXAMPLE_NETTEST_NOMAC=y
-CONFIG_EXAMPLE_NETTEST_IPADDR=(10L<<24|0L<<16|0L<<8|2L)
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10L<<24|0L<<16|0L<<8|1L)
-CONFIG_EXAMPLE_NETTEST_NETMASK=(255L<<24|255L<<16|255L<<8|0L)
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10L<<24|0L<<16|0L<<8|1L)
+CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
+CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
+CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
+CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
 
 #
 # Settings for examples/ostest
@@ -722,9 +722,9 @@ CONFIG_NSH_ARCHINIT=n
 CONFIG_NSH_IOBUFFER_SIZE=512
 CONFIG_NSH_DHCPC=n
 CONFIG_NSH_NOMAC=y
-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)
+CONFIG_NSH_IPADDR=0x0a000002
+CONFIG_NSH_DRIPADDR=0x0a000001
+CONFIG_NSH_NETMASK=0xffffff00
 CONFIG_NSH_ROMFSMOUNTPT="/etc"
 CONFIG_NSH_INITSCRIPT="init.d/rcS"
 CONFIG_NSH_ROMFSDEVNO=0