Message ID | 1431577798-26951-2-git-send-email-joe.hershberger@ni.com |
---|---|
State | RFC |
Headers | show |
On Wed, May 13, 2015 at 11:29 PM, Joe Hershberger <joe.hershberger@ni.com> wrote: > All of the ENV_IS_IN_* configs moved to Kconfig. > > Signed-off-by: Joe Hershberger <joe.hershberger@ni.com> > > --- > > common/Kconfig | 85 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 85 insertions(+) > > diff --git a/common/Kconfig b/common/Kconfig > index 15759f7..4397e69 100644 > --- a/common/Kconfig > +++ b/common/Kconfig > @@ -1,3 +1,88 @@ > +menu "Environment" > + > +choice > + prompt "Environment location" > + default ENV_IS_NOWHERE > + help > + Select where the environment is persisted. > + > +config ENV_IS_IN_DATAFLASH > + bool "Data Flash" > + help > + Select this if you have a DataFlash memory device which you > + want to use for the environment. > + > +config ENV_IS_IN_EEPROM > + bool "EEPROM" > + help > + Select this if you have an EEPROM or similar serial access > + device and a driver for it. > + > +config ENV_IS_IN_FLASH > + bool "Flash" > + help > + Select this if the environment is in flash memory. > + > +config ENV_IS_IN_MMC > + bool "MMC" > + help > + Select this if you have an MMC device which you want to use > + for the environment. > + > +config ENV_IS_IN_FAT > + bool "FAT" > + help > + Select this if you want to use the FAT file system for the > + environment. > + > +config ENV_IS_IN_NAND > + bool "NAND" > + help > + Select this if you have a NAND device which you want to use > + for the environment. > + > +config ENV_IS_IN_NVRAM > + bool "NVRAM" > + help > + Select this if you have some non-volatile memory device > + (NVRAM, battery buffered SRAM) which you want to use for the > + environment. > + > +config ENV_IS_IN_ONENAND > + bool "OneNAND" > + help > + Select this if you have a OneNAND device which you want to use > + for the environment. > + > +config ENV_IS_IN_SPI_FLASH > + bool "SPI Flash" > + help > + Select this if you have a SPI Flash memory device which you > + want to use for the environment. > + > +config ENV_IS_IN_REMOTE > + bool "Remote" > + help > + Select this if you have a remote memory space which you > + want to use for the local device's environment. > + > +config ENV_IS_IN_UBI > + bool "UBI" > + help > + Select this if you have an UBI volume that you want to use for > + the environment. This has the benefit of wear-leveling the > + environment accesses, which is important on NAND. > + > +config ENV_IS_NOWHERE > + bool "Nowhere" > + help > + Select this if there is no storage for the environment and > + each boot U-Boot will use the default environment. > + > +endchoice > + > +endmenu > + > menu "Command line interface" > > config HUSH_PARSER This technically needs to be squashed with the patch that follows it to preserve bisectability, but I wanted to post it separately to be easier to look at. -Joe
diff --git a/common/Kconfig b/common/Kconfig index 15759f7..4397e69 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -1,3 +1,88 @@ +menu "Environment" + +choice + prompt "Environment location" + default ENV_IS_NOWHERE + help + Select where the environment is persisted. + +config ENV_IS_IN_DATAFLASH + bool "Data Flash" + help + Select this if you have a DataFlash memory device which you + want to use for the environment. + +config ENV_IS_IN_EEPROM + bool "EEPROM" + help + Select this if you have an EEPROM or similar serial access + device and a driver for it. + +config ENV_IS_IN_FLASH + bool "Flash" + help + Select this if the environment is in flash memory. + +config ENV_IS_IN_MMC + bool "MMC" + help + Select this if you have an MMC device which you want to use + for the environment. + +config ENV_IS_IN_FAT + bool "FAT" + help + Select this if you want to use the FAT file system for the + environment. + +config ENV_IS_IN_NAND + bool "NAND" + help + Select this if you have a NAND device which you want to use + for the environment. + +config ENV_IS_IN_NVRAM + bool "NVRAM" + help + Select this if you have some non-volatile memory device + (NVRAM, battery buffered SRAM) which you want to use for the + environment. + +config ENV_IS_IN_ONENAND + bool "OneNAND" + help + Select this if you have a OneNAND device which you want to use + for the environment. + +config ENV_IS_IN_SPI_FLASH + bool "SPI Flash" + help + Select this if you have a SPI Flash memory device which you + want to use for the environment. + +config ENV_IS_IN_REMOTE + bool "Remote" + help + Select this if you have a remote memory space which you + want to use for the local device's environment. + +config ENV_IS_IN_UBI + bool "UBI" + help + Select this if you have an UBI volume that you want to use for + the environment. This has the benefit of wear-leveling the + environment accesses, which is important on NAND. + +config ENV_IS_NOWHERE + bool "Nowhere" + help + Select this if there is no storage for the environment and + each boot U-Boot will use the default environment. + +endchoice + +endmenu + menu "Command line interface" config HUSH_PARSER
All of the ENV_IS_IN_* configs moved to Kconfig. Signed-off-by: Joe Hershberger <joe.hershberger@ni.com> --- common/Kconfig | 85 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 85 insertions(+)