diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 926bee501e..18288e21b8 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -77,7 +77,7 @@ endchoice config ARCH string - default "c5471" if ARCH_CHIP_C5471 + default "c5471" if ARCH_CHIP_C5471 default "calypso" if ARCH_CHIP_CALYPSO default "dm320" if ARCH_CHIP_DM320 default "imx" if ARCH_CHIP_IMX diff --git a/arch/avr/Kconfig b/arch/avr/Kconfig index ae2bf31307..c2ded90809 100644 --- a/arch/avr/Kconfig +++ b/arch/avr/Kconfig @@ -2,3 +2,80 @@ # For a description of the syntax of this configuration file, # see misc/tools/kconfig-language.txt. # + +if ARCH_AVR +choice + prompt "Atmel AVR chip selection" + default ARCH_CHIP_AT32UC3B0256 + +config ARCH_CHIP_ATMEGA128 + bool "ATMega128" + ---help--- + Atmel ATMega128 8-bit AVR. + +config ARCH_CHIP_AT90USB646 + bool "AT90USB646" + ---help--- + Atmel AT90USB646 8-bit AVR. + +config ARCH_CHIP_AT90USB647 + bool "AT90USB647" + ---help--- + Atmel AT90USB647 8-bit AVR. + +config ARCH_CHIP_AT90USB1286 + bool "AT90USB1286" + ---help--- + Atmel AT90USB1286 8-bit AVR. + +config ARCH_CHIP_AT90USB1287 + bool "AT90USB1287" + ---help--- + Atmel AT90USB1287 8-bit AVR. + +config ARCH_CHIP_AT32UC3B0256 + bool "AT32UC3B0256" + ---help--- + Atmel AT32UC3B0256 32-bit AVR32. + +endchoice + +config ARCH_FAMILY_AVR + bool + default y if ARCH_CHIP_ATMEGA128 || ARCH_CHIP_AT90USB646 || ARCH_CHIP_AT90USB647 || ARCH_CHIP_AT90USB1286 || ARCH_CHIP_AT90USB1287 + +config ARCH_FAMILY_AVR32 + bool + default y if ARCH_CHIP_AT32UC3B0256 + +config ARCH_FAMILY + string + default "avr" if ARCH_FAMILY_AVR + default "avr32" if ARCH_FAMILY_AVR32 + +config ARCH_ATMEGA + bool + default y if ARCH_CHIP_ATMEGA128 + +config ARCH_AT90USB + bool + default y if ARCH_CHIP_AT90USB646 || ARCH_CHIP_AT90USB647 || ARCH_CHIP_AT90USB1286 || ARCH_CHIP_AT90USB1287 + +config ARCH_AT32UC3 + bool + default y if ARCH_CHIP_AT32UC3B0256 + +config ARCH + string + default "atmega" if ARCH_ATMEGA + default "at90usb" if ARCH_AT90USB + default "at32uc3" if ARCH_AT32UC3 + +source arch/avr/src/common/Kconfig +source arch/avr/src/avr/Kconfig +source arch/avr/src/at90usb/Kconfig +source arch/avr/src/atmega/Kconfig +source arch/avr/src/avr32/Kconfig +source arch/avr/src/at32uc3/Kconfig + +endif diff --git a/arch/avr/src/at32uc3/Kconfig b/arch/avr/src/at32uc3/Kconfig new file mode 100644 index 0000000000..4c3bd28c66 --- /dev/null +++ b/arch/avr/src/at32uc3/Kconfig @@ -0,0 +1,7 @@ +# +# For a description of the syntax of this configuration file, +# see misc/tools/kconfig-language.txt. +# + +if ARCH_AT32UC3 +endif diff --git a/arch/avr/src/at90usb/Kconfig b/arch/avr/src/at90usb/Kconfig new file mode 100644 index 0000000000..78cd6d059b --- /dev/null +++ b/arch/avr/src/at90usb/Kconfig @@ -0,0 +1,7 @@ +# +# For a description of the syntax of this configuration file, +# see misc/tools/kconfig-language.txt. +# + +if ARCH_AT90USB +endif diff --git a/arch/avr/src/atmega/Kconfig b/arch/avr/src/atmega/Kconfig new file mode 100644 index 0000000000..f0004d7fec --- /dev/null +++ b/arch/avr/src/atmega/Kconfig @@ -0,0 +1,8 @@ +# +# For a description of the syntax of this configuration file, +# see misc/tools/kconfig-language.txt. +# + +if ARCH_ATMEGA +endif + diff --git a/arch/avr/src/avr/Kconfig b/arch/avr/src/avr/Kconfig new file mode 100644 index 0000000000..1b21ce810c --- /dev/null +++ b/arch/avr/src/avr/Kconfig @@ -0,0 +1,7 @@ +# +# For a description of the syntax of this configuration file, +# see misc/tools/kconfig-language.txt. +# + +if ARCH_FAMILY_AVR +endif diff --git a/arch/avr/src/avr32/Kconfig b/arch/avr/src/avr32/Kconfig new file mode 100644 index 0000000000..ca1fcd2bf7 --- /dev/null +++ b/arch/avr/src/avr32/Kconfig @@ -0,0 +1,7 @@ +# +# For a description of the syntax of this configuration file, +# see misc/tools/kconfig-language.txt. +# + +if ARCH_FAMILY_AVR32 +endif diff --git a/arch/avr/src/common/Kconfig b/arch/avr/src/common/Kconfig new file mode 100644 index 0000000000..7966a39c5a --- /dev/null +++ b/arch/avr/src/common/Kconfig @@ -0,0 +1,7 @@ +# +# For a description of the syntax of this configuration file, +# see misc/tools/kconfig-language.txt. +# + +if ARCH_AVR +endif diff --git a/arch/sh/src/m16c/m16c_head.S b/arch/sh/src/m16c/m16c_head.S index d0ab437612..4e6b0e2c83 100644 --- a/arch/sh/src/m16c/m16c_head.S +++ b/arch/sh/src/m16c/m16c_head.S @@ -158,7 +158,7 @@ _g_heapbase: ************************************************************************************/ /************************************************************************************ - * Name: _start + * Name: __start * * Description: * After reset, program execution starts here. diff --git a/include/nuttx/watchdog.h b/include/nuttx/watchdog.h index 2372b2411e..bcf8b1522f 100755 --- a/include/nuttx/watchdog.h +++ b/include/nuttx/watchdog.h @@ -216,6 +216,10 @@ extern "C" { * When this function is called, the "lower half" driver should be in the * disabled state (as if the stop() method had already been called). * + * NOTE: Normally, this function would not be called by application code. + * Rather it is called indirectly through the architecture-specific + * interface up_wdginitialize() described below. + * * Input parameters: * dev path - The full path to the driver to be registers in the NuttX * pseudo-filesystem. The recommended convention is to name all watchdog @@ -255,6 +259,31 @@ EXTERN void watchdog_unregister(FAR void *handle); * Platform-Independent "Lower-Half" Watchdog Driver Interfaces ****************************************************************************/ +/**************************************************************************** + * Architecture-specific Application Interfaces + ****************************************************************************/ + +/**************************************************************************** + * Name: up_wdginitialize() + * + * Description: + * Perform architecture-specific initialization of the Watchdog hardware. + * This interface should be provided by all configurations using + * to avoid exposed platform-dependent logic. + * + * At a minimum, this function should all watchdog_register() which is + * described above. + * + * Input parameters: + * None + * + * Returned Value: + * Zero on success; a negated errno value on failure. + * + ****************************************************************************/ + +EXTERN int up_wdginitialize(void); + #undef EXTERN #ifdef __cplusplus }