diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2013-06-12 17:32:00 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2013-06-12 17:32:00 -0600 |
| commit | 3980a00ab75c580d1f4246a9be226631832c9e6e (patch) | |
| tree | 1d8e177d23a39c0fe30e44cc1843cb3f4d737021 /apps/system/i2c | |
| parent | 5633c904e72b25119bbd9056bc0951ef9f6ad88e (diff) | |
| download | nuttx-3980a00ab75c580d1f4246a9be226631832c9e6e.tar.gz nuttx-3980a00ab75c580d1f4246a9be226631832c9e6e.tar.bz2 nuttx-3980a00ab75c580d1f4246a9be226631832c9e6e.zip | |
Remove CONFIG_XYZ_BUILTIN configurations, replace with the single CONFIG_NSH_BUILTIN_APPS. Add SAM3/4 sam_periphclks.h which is just a header file that includes the right header file. Misc SAM3U-EK cleanup
Diffstat (limited to 'apps/system/i2c')
| -rw-r--r-- | apps/system/i2c/Kconfig | 9 | ||||
| -rw-r--r-- | apps/system/i2c/README.txt | 4 | ||||
| -rw-r--r-- | apps/system/i2c/i2ctool.h | 2 |
3 files changed, 6 insertions, 9 deletions
diff --git a/apps/system/i2c/Kconfig b/apps/system/i2c/Kconfig index 745378b37..5898f7e7b 100644 --- a/apps/system/i2c/Kconfig +++ b/apps/system/i2c/Kconfig @@ -11,12 +11,7 @@ config SYSTEM_I2CTOOL ---help--- Enable support for the I2C tool. -config I2CTOOL_BUILTIN - bool "NSH built-in command" - default y - depends on SYSTEM_I2CTOOL && NSH_BUILTIN_APPS - ---help--- - Build the tools as an NSH built-in command +if SYSTEM_I2CTOOL config I2CTOOL_MINBUS int "Minimum bus number" @@ -59,3 +54,5 @@ config I2CTOOL_DEFFREQ depends on SYSTEM_I2CTOOL ---help--- Default I2C frequency (default: 4000000) + +endif diff --git a/apps/system/i2c/README.txt b/apps/system/i2c/README.txt index 1d6f22025..ee49e7d84 100644 --- a/apps/system/i2c/README.txt +++ b/apps/system/i2c/README.txt @@ -46,7 +46,7 @@ the apps/nshlib/README.txt file for information about add-ons. Configuration Options --------------------- -CONFIG_I2CTOOL_BUILTIN - Build the tools as an NSH built-in command +CONFIG_NSH_BUILTIN_APPS - Build the tools as an NSH built-in command CONFIG_I2CTOOL_MINBUS - Smallest bus index supported by the hardware (default 0). CONFIG_I2CTOOL_MAXBUS - Largest bus index supported by the hardware (default 3) CONFIG_I2CTOOL_MINADDR - Minium device address (default: 0x03) @@ -391,7 +391,7 @@ options in the NuttX configuration. This configuration is the defconfig file in your configuration directory that is copied to the NuttX top-level directory as .config when NuttX is configured. - CONFIG_I2CTOOL_BUILTIN: Build the tools as an NSH built-in command + CONFIG_NSH_BUILTIN_APPS: Build the tools as an NSH built-in command CONFIG_I2CTOOL_MINBUS: Smallest bus index supported by the hardware (default 0). CONFIG_I2CTOOL_MAXBUS: Largest bus index supported by the hardware (default 3) CONFIG_I2CTOOL_MINADDR: Minium device address (default: 0x03) diff --git a/apps/system/i2c/i2ctool.h b/apps/system/i2c/i2ctool.h index 4ff26d03e..d8cc07203 100644 --- a/apps/system/i2c/i2ctool.h +++ b/apps/system/i2c/i2ctool.h @@ -55,7 +55,7 @@ * Definitions ****************************************************************************/ /* Configuration ************************************************************/ -/* CONFIG_I2CTOOL_BUILTIN - Build the tools as an NSH built-in command +/* CONFIG_NSH_BUILTIN_APPS - Build the tools as an NSH built-in command * CONFIG_I2CTOOL_MINBUS - Smallest bus index supported by the hardware (default 0). * CONFIG_I2CTOOL_MAXBUS - Largest bus index supported by the hardware (default 3) * CONFIG_I2CTOOL_MINADDR - Minium device address (default: 0x03) |