diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-11-27 11:08:27 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-11-27 11:08:27 -0600 |
| commit | 9035e07120245e2ebeaf4a2102f843300c5319e8 (patch) | |
| tree | f6199e2a5408d4180b6f02dc2b5dec5c7958a512 | |
| parent | 5fe17528c22de1e6c8b591892ae97b2d327fbc21 (diff) | |
| download | nuttx-9035e07120245e2ebeaf4a2102f843300c5319e8.tar.gz nuttx-9035e07120245e2ebeaf4a2102f843300c5319e8.tar.bz2 nuttx-9035e07120245e2ebeaf4a2102f843300c5319e8.zip | |
Widen the name space: Rename CONFIG_SPI_EEPROM to CONFIG_EEPROM so that I2C EEPROMs can live there too
| -rw-r--r-- | nuttx/drivers/Kconfig | 21 | ||||
| -rw-r--r-- | nuttx/drivers/Makefile | 2 | ||||
| -rw-r--r-- | nuttx/drivers/eeprom/Kconfig | 6 | ||||
| -rw-r--r-- | nuttx/drivers/eeprom/Make.defs | 4 |
4 files changed, 17 insertions, 16 deletions
diff --git a/nuttx/drivers/Kconfig b/nuttx/drivers/Kconfig index f2eb26efb..34ea89a13 100644 --- a/nuttx/drivers/Kconfig +++ b/nuttx/drivers/Kconfig @@ -207,19 +207,8 @@ menuconfig SPI if SPI source drivers/spi/Kconfig - -menuconfig SPI_EEPROM - bool "SPI EEPROM support" - default n - ---help--- - This directory holds implementations of SPI EEPROM drivers - -if SPI_EEPROM -source drivers/eeprom/Kconfig endif -endif # SPI - menuconfig I2S bool "I2S Driver Support" default n @@ -422,6 +411,16 @@ if MTD source drivers/mtd/Kconfig endif # MTD +menuconfig EEPROM + bool "EEPROM support" + default n + ---help--- + This directory holds implementations of EEPROM drivers. + +if EEPROM +source drivers/eeprom/Kconfig +endif + menuconfig NETDEVICES bool "Network Device/PHY Support" default n if !ARCH_HAVE_PHY diff --git a/nuttx/drivers/Makefile b/nuttx/drivers/Makefile index 229b3d6f6..62d1986ca 100644 --- a/nuttx/drivers/Makefile +++ b/nuttx/drivers/Makefile @@ -52,11 +52,11 @@ VPATH = . include analog$(DELIM)Make.defs include audio$(DELIM)Make.defs include bch$(DELIM)Make.defs -include eeprom$(DELIM)Make.defs include input$(DELIM)Make.defs include lcd$(DELIM)Make.defs include mmcsd$(DELIM)Make.defs include mtd$(DELIM)Make.defs +include eeprom$(DELIM)Make.defs include net$(DELIM)Make.defs include pipes$(DELIM)Make.defs include power$(DELIM)Make.defs diff --git a/nuttx/drivers/eeprom/Kconfig b/nuttx/drivers/eeprom/Kconfig index 14c31b3e8..9d3adc016 100644 --- a/nuttx/drivers/eeprom/Kconfig +++ b/nuttx/drivers/eeprom/Kconfig @@ -3,10 +3,11 @@ # see misc/tools/kconfig-language.txt. # +if EEPROM config SPI_EE_25XX bool "Microchip 25xxNNN / Atmel AT25NNN EEPROM devices" default n - depends on SPI_EEPROM + depends on SPI ---help--- This selection enables support for the Microchip/Atmel SPI EEPROM devices @@ -18,4 +19,5 @@ config EE25XX_SPIMODE default 0 depends on SPI_EE_25XX -endif +endif # SPI_EE_25XX +endif # EEPROM diff --git a/nuttx/drivers/eeprom/Make.defs b/nuttx/drivers/eeprom/Make.defs index d9588c7c6..afbebea62 100644 --- a/nuttx/drivers/eeprom/Make.defs +++ b/nuttx/drivers/eeprom/Make.defs @@ -33,9 +33,9 @@ # ############################################################################ -# Include SPI EEPROM support +# Include EEPROM support -ifeq ($(CONFIG_SPI_EEPROM),y) +ifeq ($(CONFIG_EEPROM),y) # Include the Microchip/Atmel xx25xx driver |