Browse Source

Move environment files from common/ to env/

About a quarter of the files in common/ relate to the environment. It
seems better to put these into their own subdirectory and remove the
prefix.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
tags/2020-06-01
Simon Glass 3 years ago
committed by Tom Rini
parent
commit
0649cd0d49
43 changed files with 532 additions and 520 deletions
  1. +2
    -0
      Kconfig
  2. +1
    -0
      Makefile
  3. +2
    -2
      arch/sh/cpu/u-boot.lds
  4. +1
    -1
      board/freescale/mx31ads/u-boot.lds
  5. +0
    -442
      common/Kconfig
  6. +1
    -48
      common/Makefile
  7. +441
    -0
      env/Kconfig
  8. +57
    -0
      env/Makefile
  9. +0
    -0
      env/attr.c
  10. +0
    -0
      env/callback.c
  11. +0
    -0
      env/common.c
  12. +0
    -0
      env/dataflash.c
  13. +0
    -0
      env/eeprom.c
  14. +0
    -0
      env/embedded.c
  15. +0
    -0
      env/ext4.c
  16. +0
    -0
      env/fat.c
  17. +0
    -0
      env/flags.c
  18. +0
    -0
      env/flash.c
  19. +0
    -0
      env/mmc.c
  20. +0
    -0
      env/nand.c
  21. +0
    -0
      env/nowhere.c
  22. +0
    -0
      env/nvram.c
  23. +0
    -0
      env/onenand.c
  24. +0
    -0
      env/remote.c
  25. +0
    -0
      env/sata.c
  26. +0
    -0
      env/sf.c
  27. +0
    -0
      env/ubi.c
  28. +2
    -2
      include/configs/M5208EVBE.h
  29. +1
    -1
      include/configs/M5235EVB.h
  30. +2
    -2
      include/configs/M5249EVB.h
  31. +2
    -2
      include/configs/M5253DEMO.h
  32. +1
    -1
      include/configs/M5253EVBE.h
  33. +2
    -2
      include/configs/M5272C3.h
  34. +2
    -2
      include/configs/M5275EVB.h
  35. +1
    -1
      include/configs/M5282EVB.h
  36. +1
    -1
      include/configs/M53017EVB.h
  37. +2
    -2
      include/configs/M5329EVB.h
  38. +2
    -2
      include/configs/M5373EVB.h
  39. +2
    -2
      include/configs/amcore.h
  40. +1
    -1
      include/configs/astro_mcf5373l.h
  41. +2
    -2
      include/configs/cobra5272.h
  42. +2
    -2
      scripts/Makefile.spl
  43. +2
    -2
      tools/Makefile

+ 2
- 0
Kconfig View File

@@ -380,6 +380,8 @@ source "disk/Kconfig"

source "dts/Kconfig"

source "env/Kconfig"

source "net/Kconfig"

source "drivers/Kconfig"


+ 1
- 0
Makefile View File

@@ -690,6 +690,7 @@ libs-y += drivers/usb/phy/
libs-y += drivers/usb/ulpi/
libs-y += cmd/
libs-y += common/
libs-y += env/
libs-$(CONFIG_API) += api/
libs-$(CONFIG_HAS_POST) += post/
libs-y += test/


+ 2
- 2
arch/sh/cpu/u-boot.lds View File

@@ -33,9 +33,9 @@ SECTIONS
KEEP(CONFIG_BOARDDIR/lowlevel_init.o (.text .spiboot1.text))
KEEP(*(.spiboot2.text))
. = ALIGN(8192);
common/env_embedded.o (.ppcenv)
env/embedded.o (.ppcenv)
. = ALIGN(8192);
common/env_embedded.o (.ppcenvr)
env/embedded.o (.ppcenvr)
. = ALIGN(8192);
*(.text)
. = ALIGN(4);


+ 1
- 1
board/freescale/mx31ads/u-boot.lds View File

@@ -30,7 +30,7 @@ SECTIONS
drivers/mtd/built-in.o (.text*)

. = DEFINED(env_offset) ? env_offset : .;
common/env_embedded.o(.text*)
env/embedded.o(.text*)

*(.text*)
}


+ 0
- 442
common/Kconfig View File

@@ -174,448 +174,6 @@ config SPI_BOOT

endmenu

menu "Environment"

config ENV_IS_IN_DATAFLASH
bool "Environment in dataflash"
depends on !CHAIN_OF_TRUST
help
Define this if you have a DataFlash memory device which you
want to use for the environment.

- CONFIG_ENV_OFFSET:
- CONFIG_ENV_ADDR:
- CONFIG_ENV_SIZE:

These three #defines specify the offset and size of the
environment area within the total memory of your DataFlash placed
at the specified address.

config ENV_IS_IN_EEPROM
bool "Environment in EEPROM"
depends on !CHAIN_OF_TRUST
help
Use this if you have an EEPROM or similar serial access
device and a driver for it.

- CONFIG_ENV_OFFSET:
- CONFIG_ENV_SIZE:

These two #defines specify the offset and size of the
environment area within the total memory of your EEPROM.

- CONFIG_SYS_I2C_EEPROM_ADDR:
If defined, specified the chip address of the EEPROM device.
The default address is zero.

- CONFIG_SYS_I2C_EEPROM_BUS:
If defined, specified the i2c bus of the EEPROM device.

- CONFIG_SYS_EEPROM_PAGE_WRITE_BITS:
If defined, the number of bits used to address bytes in a
single page in the EEPROM device. A 64 byte page, for example
would require six bits.

- CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS:
If defined, the number of milliseconds to delay between
page writes. The default is zero milliseconds.

- CONFIG_SYS_I2C_EEPROM_ADDR_LEN:
The length in bytes of the EEPROM memory array address. Note
that this is NOT the chip address length!

- CONFIG_SYS_I2C_EEPROM_ADDR_OVERFLOW:
EEPROM chips that implement "address overflow" are ones
like Catalyst 24WC04/08/16 which has 9/10/11 bits of
address and the extra bits end up in the "chip address" bit
slots. This makes a 24WC08 (1Kbyte) chip look like four 256
byte chips.

Note that we consider the length of the address field to
still be one byte because the extra address bits are hidden
in the chip address.

- CONFIG_SYS_EEPROM_SIZE:
The size in bytes of the EEPROM device.

- CONFIG_ENV_EEPROM_IS_ON_I2C
define this, if you have I2C and SPI activated, and your
EEPROM, which holds the environment, is on the I2C bus.

- CONFIG_I2C_ENV_EEPROM_BUS
if you have an Environment on an EEPROM reached over
I2C muxes, you can define here, how to reach this
EEPROM. For example:

#define CONFIG_I2C_ENV_EEPROM_BUS 1

EEPROM which holds the environment, is reached over
a pca9547 i2c mux with address 0x70, channel 3.

config ENV_IS_IN_FAT
bool "Environment is in a FAT filesystem"
depends on !CHAIN_OF_TRUST
select FAT_WRITE
help
Define this if you want to use the FAT file system for the environment.


- CONFIG_FAT_WRITE:
This must be enabled. Otherwise it cannot save the environment file.

config ENV_IS_IN_FLASH
bool "Environment in flash memory"
depends on !CHAIN_OF_TRUST
help
Define this if you have a flash device which you want to use for the
environment.

a) The environment occupies one whole flash sector, which is
"embedded" in the text segment with the U-Boot code. This
happens usually with "bottom boot sector" or "top boot
sector" type flash chips, which have several smaller
sectors at the start or the end. For instance, such a
layout can have sector sizes of 8, 2x4, 16, Nx32 kB. In
such a case you would place the environment in one of the
4 kB sectors - with U-Boot code before and after it. With
"top boot sector" type flash chips, you would put the
environment in one of the last sectors, leaving a gap
between U-Boot and the environment.

CONFIG_ENV_OFFSET:

Offset of environment data (variable area) to the
beginning of flash memory; for instance, with bottom boot
type flash chips the second sector can be used: the offset
for this sector is given here.

CONFIG_ENV_OFFSET is used relative to CONFIG_SYS_FLASH_BASE.

CONFIG_ENV_ADDR:

This is just another way to specify the start address of
the flash sector containing the environment (instead of
CONFIG_ENV_OFFSET).

CONFIG_ENV_SECT_SIZE:

Size of the sector containing the environment.


b) Sometimes flash chips have few, equal sized, BIG sectors.
In such a case you don't want to spend a whole sector for
the environment.

CONFIG_ENV_SIZE:

If you use this in combination with CONFIG_ENV_IS_IN_FLASH
and CONFIG_ENV_SECT_SIZE, you can specify to use only a part
of this flash sector for the environment. This saves
memory for the RAM copy of the environment.

It may also save flash memory if you decide to use this
when your environment is "embedded" within U-Boot code,
since then the remainder of the flash sector could be used
for U-Boot code. It should be pointed out that this is
STRONGLY DISCOURAGED from a robustness point of view:
updating the environment in flash makes it always
necessary to erase the WHOLE sector. If something goes
wrong before the contents has been restored from a copy in
RAM, your target system will be dead.

CONFIG_ENV_ADDR_REDUND
CONFIG_ENV_SIZE_REDUND

These settings describe a second storage area used to hold
a redundant copy of the environment data, so that there is
a valid backup copy in case there is a power failure during
a "saveenv" operation.

BE CAREFUL! Any changes to the flash layout, and some changes to the
source code will make it necessary to adapt <board>/u-boot.lds*
accordingly!

config ENV_IS_IN_MMC
bool "Environment in an MMC device"
depends on !CHAIN_OF_TRUST
default y if ARCH_SUNXI
help
Define this if you have an MMC device which you want to use for the
environment.

CONFIG_SYS_MMC_ENV_DEV:

Specifies which MMC device the environment is stored in.

CONFIG_SYS_MMC_ENV_PART (optional):

Specifies which MMC partition the environment is stored in. If not
set, defaults to partition 0, the user area. Common values might be
1 (first MMC boot partition), 2 (second MMC boot partition).

CONFIG_ENV_OFFSET:
CONFIG_ENV_SIZE:

These two #defines specify the offset and size of the environment
area within the specified MMC device.

If offset is positive (the usual case), it is treated as relative to
the start of the MMC partition. If offset is negative, it is treated
as relative to the end of the MMC partition. This can be useful if
your board may be fitted with different MMC devices, which have
different sizes for the MMC partitions, and you always want the
environment placed at the very end of the partition, to leave the
maximum possible space before it, to store other data.

These two values are in units of bytes, but must be aligned to an
MMC sector boundary.

CONFIG_ENV_OFFSET_REDUND (optional):

Specifies a second storage area, of CONFIG_ENV_SIZE size, used to
hold a redundant copy of the environment data. This provides a
valid backup copy in case the other copy is corrupted, e.g. due
to a power failure during a "saveenv" operation.

This value may also be positive or negative; this is handled in the
same way as CONFIG_ENV_OFFSET.

This value is also in units of bytes, but must also be aligned to
an MMC sector boundary.

CONFIG_ENV_SIZE_REDUND (optional):

This value need not be set, even when CONFIG_ENV_OFFSET_REDUND is
set. If this value is set, it must be set to the same value as
CONFIG_ENV_SIZE.

config ENV_IS_IN_NAND
bool "Environment in a NAND device"
depends on !CHAIN_OF_TRUST
help
Define this if you have a NAND device which you want to use for the
environment.

- CONFIG_ENV_OFFSET:
- CONFIG_ENV_SIZE:

These two #defines specify the offset and size of the environment
area within the first NAND device. CONFIG_ENV_OFFSET must be
aligned to an erase block boundary.

- CONFIG_ENV_OFFSET_REDUND (optional):

This setting describes a second storage area of CONFIG_ENV_SIZE
size used to hold a redundant copy of the environment data, so
that there is a valid backup copy in case there is a power failure
during a "saveenv" operation. CONFIG_ENV_OFFSET_REDUND must be
aligned to an erase block boundary.

- CONFIG_ENV_RANGE (optional):

Specifies the length of the region in which the environment
can be written. This should be a multiple of the NAND device's
block size. Specifying a range with more erase blocks than
are needed to hold CONFIG_ENV_SIZE allows bad blocks within
the range to be avoided.

- CONFIG_ENV_OFFSET_OOB (optional):

Enables support for dynamically retrieving the offset of the
environment from block zero's out-of-band data. The
"nand env.oob" command can be used to record this offset.
Currently, CONFIG_ENV_OFFSET_REDUND is not supported when
using CONFIG_ENV_OFFSET_OOB.

config ENV_IS_IN_NVRAM
bool "Environment in a non-volatile RAM"
depends on !CHAIN_OF_TRUST
help
Define this if you have some non-volatile memory device
(NVRAM, battery buffered SRAM) which you want to use for the
environment.

- CONFIG_ENV_ADDR:
- CONFIG_ENV_SIZE:

These two #defines are used to determine the memory area you
want to use for environment. It is assumed that this memory
can just be read and written to, without any special
provision.

config ENV_IS_IN_ONENAND
bool "Environment is in OneNAND"
depends on !CHAIN_OF_TRUST
help
Define this if you want to put your local device's environment in
OneNAND.

- CONFIG_ENV_ADDR:
- CONFIG_ENV_SIZE:

These two #defines are used to determine the device range you
want to use for environment. It is assumed that this memory
can just be read and written to, without any special
provision.

config ENV_IS_IN_REMOTE
bool "Environment is in remove memory space"
depends on !CHAIN_OF_TRUST
help
Define this if you have a remote memory space which you
want to use for the local device's environment.

- CONFIG_ENV_ADDR:
- CONFIG_ENV_SIZE:

These two #defines specify the address and size of the
environment area within the remote memory space. The
local device can get the environment from remote memory
space by SRIO or PCIE links.

config ENV_IS_IN_SPI_FLASH
bool "Environment is in SPI flash"
depends on !CHAIN_OF_TRUST
help
Define this if you have a SPI Flash memory device which you
want to use for the environment.

- CONFIG_ENV_OFFSET:
- CONFIG_ENV_SIZE:

These two #defines specify the offset and size of the
environment area within the SPI Flash. CONFIG_ENV_OFFSET must be
aligned to an erase sector boundary.

- CONFIG_ENV_SECT_SIZE:

Define the SPI flash's sector size.

- CONFIG_ENV_OFFSET_REDUND (optional):

This setting describes a second storage area of CONFIG_ENV_SIZE
size used to hold a redundant copy of the environment data, so
that there is a valid backup copy in case there is a power failure
during a "saveenv" operation. CONFIG_ENV_OFFSET_REDUND must be
aligned to an erase sector boundary.

- CONFIG_ENV_SPI_BUS (optional):
- CONFIG_ENV_SPI_CS (optional):

Define the SPI bus and chip select. If not defined they will be 0.

- CONFIG_ENV_SPI_MAX_HZ (optional):

Define the SPI max work clock. If not defined then use 1MHz.

- CONFIG_ENV_SPI_MODE (optional):

Define the SPI work mode. If not defined then use SPI_MODE_3.

config ENV_IS_IN_UBI
bool "Environment in a UBI volume"
depends on !CHAIN_OF_TRUST
help
Define 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_UBI_PART:

Define this to a string that is the mtd partition containing the UBI.

- CONFIG_ENV_UBI_VOLUME:

Define this to the name of the volume that you want to store the
environment in.

- CONFIG_ENV_UBI_VOLUME_REDUND:

Define this to the name of another volume to store a second copy of
the environment in. This will enable redundant environments in UBI.
It is assumed that both volumes are in the same MTD partition.

- CONFIG_UBI_SILENCE_MSG
- CONFIG_UBIFS_SILENCE_MSG

You will probably want to define these to avoid a really noisy system
when storing the env in UBI.

config ENV_IS_NOWHERE
bool "Environment is not stored"
help
Define this if you don't want to or can't have an environment stored
on a storage medium

config ENV_FAT_INTERFACE
string "Name of the block device for the environment"
depends on ENV_IS_IN_FAT
default "mmc" if TI_COMMON_CMD_OPTIONS || ARCH_ZYNQMP || ARCH_AT91
help
Define this to a string that is the name of the block device.

config ENV_FAT_DEVICE_AND_PART
string "Device and partition for where to store the environemt in FAT"
depends on ENV_IS_IN_FAT
default "0:1" if TI_COMMON_CMD_OPTIONS
default "0:auto" if ARCH_ZYNQMP
default "0" if ARCH_AT91
help
Define this to a string to specify the partition of the device. It can
be as following:

"D:P", "D:0", "D", "D:" or "D:auto" (D, P are integers. And P >= 1)
- "D:P": device D partition P. Error occurs if device D has no
partition table.
- "D:0": device D.
- "D" or "D:": device D partition 1 if device D has partition
table, or the whole device D if has no partition
table.
- "D:auto": first partition in device D with bootable flag set.
If none, first valid partition in device D. If no
partition table then means device D.

config ENV_FAT_FILE
string "Name of the FAT file to use for the environemnt"
depends on ENV_IS_IN_FAT
default "uboot.env"
help
It's a string of the FAT file name. This file use to store the
environment.

if ARCH_SUNXI

config ENV_OFFSET
hex "Environment Offset"
depends on !ENV_IS_IN_UBI
depends on !ENV_IS_NOWHERE
default 0x88000 if ARCH_SUNXI
help
Offset from the start of the device (or partition)

config ENV_SIZE
hex "Environment Size"
depends on !ENV_IS_NOWHERE
default 0x20000 if ARCH_SUNXI
help
Size of the environment storage area

config ENV_UBI_PART
string "UBI partition name"
depends on ENV_IS_IN_UBI
help
MTD partition containing the UBI device

config ENV_UBI_VOLUME
string "UBI volume name"
depends on ENV_IS_IN_UBI
help
Name of the volume that you want to store the environment in.

endif

endmenu

config BOOTDELAY
int "delay in seconds before automatically booting"
default 2


+ 1
- 48
common/Makefile View File

@@ -19,7 +19,7 @@ ifdef CONFIG_BOOT_RETRY_TIME
obj-y += bootretry.o
endif

# boards
# # boards
obj-y += board_f.o
obj-y += board_r.o
obj-$(CONFIG_DISPLAY_BOARDINFO) += board_info.o
@@ -29,29 +29,6 @@ obj-$(CONFIG_CMD_BOOTM) += bootm.o bootm_os.o
obj-$(CONFIG_CMD_BOOTZ) += bootm.o bootm_os.o
obj-$(CONFIG_CMD_BOOTI) += bootm.o bootm_os.o

# environment
obj-y += env_attr.o
obj-y += env_callback.o
obj-y += env_flags.o
obj-$(CONFIG_ENV_IS_IN_DATAFLASH) += env_dataflash.o
obj-$(CONFIG_ENV_IS_IN_EEPROM) += env_eeprom.o
extra-$(CONFIG_ENV_IS_EMBEDDED) += env_embedded.o
obj-$(CONFIG_ENV_IS_IN_EEPROM) += env_embedded.o
extra-$(CONFIG_ENV_IS_IN_FLASH) += env_embedded.o
obj-$(CONFIG_ENV_IS_IN_NVRAM) += env_embedded.o
obj-$(CONFIG_ENV_IS_IN_FLASH) += env_flash.o
obj-$(CONFIG_ENV_IS_IN_MMC) += env_mmc.o
obj-$(CONFIG_ENV_IS_IN_FAT) += env_fat.o
obj-$(CONFIG_ENV_IS_IN_EXT4) += env_ext4.o
obj-$(CONFIG_ENV_IS_IN_NAND) += env_nand.o
obj-$(CONFIG_ENV_IS_IN_NVRAM) += env_nvram.o
obj-$(CONFIG_ENV_IS_IN_ONENAND) += env_onenand.o
obj-$(CONFIG_ENV_IS_IN_SATA) += env_sata.o
obj-$(CONFIG_ENV_IS_IN_SPI_FLASH) += env_sf.o
obj-$(CONFIG_ENV_IS_IN_REMOTE) += env_remote.o
obj-$(CONFIG_ENV_IS_IN_UBI) += env_ubi.o
obj-$(CONFIG_ENV_IS_NOWHERE) += env_nowhere.o

obj-$(CONFIG_CMD_BEDBUG) += bedbug.o
obj-$(CONFIG_$(SPL_TPL_)OF_LIBFDT) += fdt_support.o

@@ -92,7 +69,6 @@ ifdef CONFIG_SPL_BUILD
obj-$(CONFIG_SPL_DFU_SUPPORT) += dfu.o
obj-$(CONFIG_SPL_DFU_SUPPORT) += cli_hush.o
obj-$(CONFIG_SPL_HASH_SUPPORT) += hash.o
obj-$(CONFIG_ENV_IS_IN_FLASH) += env_flash.o
obj-$(CONFIG_SPL_YMODEM_SUPPORT) += xyzModem.o
obj-$(CONFIG_SPL_LOAD_FIT) += common_fit.o
obj-$(CONFIG_SPL_NET_SUPPORT) += miiphyutil.o
@@ -101,28 +77,7 @@ ifdef CONFIG_SPL_USB_HOST_SUPPORT
obj-$(CONFIG_SPL_USB_SUPPORT) += usb.o usb_hub.o
obj-$(CONFIG_USB_STORAGE) += usb_storage.o
endif
# environment
ifdef CONFIG_TPL_BUILD
obj-$(CONFIG_TPL_ENV_SUPPORT) += env_attr.o
obj-$(CONFIG_TPL_ENV_SUPPORT) += env_flags.o
obj-$(CONFIG_TPL_ENV_SUPPORT) += env_callback.o
else
obj-$(CONFIG_SPL_ENV_SUPPORT) += env_attr.o
obj-$(CONFIG_SPL_ENV_SUPPORT) += env_flags.o
obj-$(CONFIG_SPL_ENV_SUPPORT) += env_callback.o
endif
ifneq ($(CONFIG_TPL_ENV_SUPPORT)$(CONFIG_SPL_ENV_SUPPORT),)
obj-$(CONFIG_ENV_IS_NOWHERE) += env_nowhere.o
obj-$(CONFIG_ENV_IS_IN_MMC) += env_mmc.o
obj-$(CONFIG_ENV_IS_IN_FAT) += env_fat.o
obj-$(CONFIG_ENV_IS_IN_EXT4) += env_ext4.o
obj-$(CONFIG_ENV_IS_IN_NAND) += env_nand.o
obj-$(CONFIG_ENV_IS_IN_SPI_FLASH) += env_sf.o
obj-$(CONFIG_ENV_IS_IN_FLASH) += env_flash.o
endif
endif
#environment
obj-y += env_common.o
#others
obj-$(CONFIG_DDR_SPD) += ddr_spd.o
obj-$(CONFIG_SPD_EEPROM) += ddr_spd.o
@@ -175,5 +130,3 @@ obj-$(CONFIG_CMD_DFU) += dfu.o
obj-y += command.o
obj-y += s_record.o
obj-y += xyzModem.o

CFLAGS_env_embedded.o := -Wa,--no-warn -DENV_CRC=$(shell tools/envcrc 2>/dev/null)

+ 441
- 0
env/Kconfig View File

@@ -0,0 +1,441 @@
menu "Environment"

config ENV_IS_IN_DATAFLASH
bool "Environment in dataflash"
depends on !CHAIN_OF_TRUST
help
Define this if you have a DataFlash memory device which you
want to use for the environment.

- CONFIG_ENV_OFFSET:
- CONFIG_ENV_ADDR:
- CONFIG_ENV_SIZE:

These three #defines specify the offset and size of the
environment area within the total memory of your DataFlash placed
at the specified address.

config ENV_IS_IN_EEPROM
bool "Environment in EEPROM"
depends on !CHAIN_OF_TRUST
help
Use this if you have an EEPROM or similar serial access
device and a driver for it.

- CONFIG_ENV_OFFSET:
- CONFIG_ENV_SIZE:

These two #defines specify the offset and size of the
environment area within the total memory of your EEPROM.

- CONFIG_SYS_I2C_EEPROM_ADDR:
If defined, specified the chip address of the EEPROM device.
The default address is zero.

- CONFIG_SYS_I2C_EEPROM_BUS:
If defined, specified the i2c bus of the EEPROM device.

- CONFIG_SYS_EEPROM_PAGE_WRITE_BITS:
If defined, the number of bits used to address bytes in a
single page in the EEPROM device. A 64 byte page, for example
would require six bits.

- CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS:
If defined, the number of milliseconds to delay between
page writes. The default is zero milliseconds.

- CONFIG_SYS_I2C_EEPROM_ADDR_LEN:
The length in bytes of the EEPROM memory array address. Note
that this is NOT the chip address length!

- CONFIG_SYS_I2C_EEPROM_ADDR_OVERFLOW:
EEPROM chips that implement "address overflow" are ones
like Catalyst 24WC04/08/16 which has 9/10/11 bits of
address and the extra bits end up in the "chip address" bit
slots. This makes a 24WC08 (1Kbyte) chip look like four 256
byte chips.

Note that we consider the length of the address field to
still be one byte because the extra address bits are hidden
in the chip address.

- CONFIG_SYS_EEPROM_SIZE:
The size in bytes of the EEPROM device.

- CONFIG_ENV_EEPROM_IS_ON_I2C
define this, if you have I2C and SPI activated, and your
EEPROM, which holds the environment, is on the I2C bus.

- CONFIG_I2C_ENV_EEPROM_BUS
if you have an Environment on an EEPROM reached over
I2C muxes, you can define here, how to reach this
EEPROM. For example:

#define CONFIG_I2C_ENV_EEPROM_BUS 1

EEPROM which holds the environment, is reached over
a pca9547 i2c mux with address 0x70, channel 3.

config ENV_IS_IN_FAT
bool "Environment is in a FAT filesystem"
depends on !CHAIN_OF_TRUST
select FAT_WRITE
help
Define this if you want to use the FAT file system for the environment.


- CONFIG_FAT_WRITE:
This must be enabled. Otherwise it cannot save the environment file.

config ENV_IS_IN_FLASH
bool "Environment in flash memory"
depends on !CHAIN_OF_TRUST
help
Define this if you have a flash device which you want to use for the
environment.

a) The environment occupies one whole flash sector, which is
"embedded" in the text segment with the U-Boot code. This
happens usually with "bottom boot sector" or "top boot
sector" type flash chips, which have several smaller
sectors at the start or the end. For instance, such a
layout can have sector sizes of 8, 2x4, 16, Nx32 kB. In
such a case you would place the environment in one of the
4 kB sectors - with U-Boot code before and after it. With
"top boot sector" type flash chips, you would put the
environment in one of the last sectors, leaving a gap
between U-Boot and the environment.

CONFIG_ENV_OFFSET:

Offset of environment data (variable area) to the
beginning of flash memory; for instance, with bottom boot
type flash chips the second sector can be used: the offset
for this sector is given here.

CONFIG_ENV_OFFSET is used relative to CONFIG_SYS_FLASH_BASE.

CONFIG_ENV_ADDR:

This is just another way to specify the start address of
the flash sector containing the environment (instead of
CONFIG_ENV_OFFSET).

CONFIG_ENV_SECT_SIZE:

Size of the sector containing the environment.


b) Sometimes flash chips have few, equal sized, BIG sectors.
In such a case you don't want to spend a whole sector for
the environment.

CONFIG_ENV_SIZE:

If you use this in combination with CONFIG_ENV_IS_IN_FLASH
and CONFIG_ENV_SECT_SIZE, you can specify to use only a part
of this flash sector for the environment. This saves
memory for the RAM copy of the environment.

It may also save flash memory if you decide to use this
when your environment is "embedded" within U-Boot code,
since then the remainder of the flash sector could be used
for U-Boot code. It should be pointed out that this is
STRONGLY DISCOURAGED from a robustness point of view:
updating the environment in flash makes it always
necessary to erase the WHOLE sector. If something goes
wrong before the contents has been restored from a copy in
RAM, your target system will be dead.

CONFIG_ENV_ADDR_REDUND
CONFIG_ENV_SIZE_REDUND

These settings describe a second storage area used to hold
a redundant copy of the environment data, so that there is
a valid backup copy in case there is a power failure during
a "saveenv" operation.

BE CAREFUL! Any changes to the flash layout, and some changes to the
source code will make it necessary to adapt <board>/u-boot.lds*
accordingly!

config ENV_IS_IN_MMC
bool "Environment in an MMC device"
depends on !CHAIN_OF_TRUST
default y if ARCH_SUNXI
help
Define this if you have an MMC device which you want to use for the
environment.

CONFIG_SYS_MMC_ENV_DEV:

Specifies which MMC device the environment is stored in.

CONFIG_SYS_MMC_ENV_PART (optional):

Specifies which MMC partition the environment is stored in. If not
set, defaults to partition 0, the user area. Common values might be
1 (first MMC boot partition), 2 (second MMC boot partition).

CONFIG_ENV_OFFSET:
CONFIG_ENV_SIZE:

These two #defines specify the offset and size of the environment
area within the specified MMC device.

If offset is positive (the usual case), it is treated as relative to
the start of the MMC partition. If offset is negative, it is treated
as relative to the end of the MMC partition. This can be useful if
your board may be fitted with different MMC devices, which have
different sizes for the MMC partitions, and you always want the
environment placed at the very end of the partition, to leave the
maximum possible space before it, to store other data.

These two values are in units of bytes, but must be aligned to an
MMC sector boundary.

CONFIG_ENV_OFFSET_REDUND (optional):

Specifies a second storage area, of CONFIG_ENV_SIZE size, used to
hold a redundant copy of the environment data. This provides a
valid backup copy in case the other copy is corrupted, e.g. due
to a power failure during a "saveenv" operation.

This value may also be positive or negative; this is handled in the
same way as CONFIG_ENV_OFFSET.

This value is also in units of bytes, but must also be aligned to
an MMC sector boundary.

CONFIG_ENV_SIZE_REDUND (optional):

This value need not be set, even when CONFIG_ENV_OFFSET_REDUND is
set. If this value is set, it must be set to the same value as
CONFIG_ENV_SIZE.

config ENV_IS_IN_NAND
bool "Environment in a NAND device"
depends on !CHAIN_OF_TRUST
help
Define this if you have a NAND device which you want to use for the
environment.

- CONFIG_ENV_OFFSET:
- CONFIG_ENV_SIZE:

These two #defines specify the offset and size of the environment
area within the first NAND device. CONFIG_ENV_OFFSET must be
aligned to an erase block boundary.

- CONFIG_ENV_OFFSET_REDUND (optional):

This setting describes a second storage area of CONFIG_ENV_SIZE
size used to hold a redundant copy of the environment data, so
that there is a valid backup copy in case there is a power failure
during a "saveenv" operation. CONFIG_ENV_OFFSET_REDUND must be
aligned to an erase block boundary.

- CONFIG_ENV_RANGE (optional):

Specifies the length of the region in which the environment
can be written. This should be a multiple of the NAND device's
block size. Specifying a range with more erase blocks than
are needed to hold CONFIG_ENV_SIZE allows bad blocks within
the range to be avoided.

- CONFIG_ENV_OFFSET_OOB (optional):

Enables support for dynamically retrieving the offset of the
environment from block zero's out-of-band data. The
"nand env.oob" command can be used to record this offset.
Currently, CONFIG_ENV_OFFSET_REDUND is not supported when
using CONFIG_ENV_OFFSET_OOB.

config ENV_IS_IN_NVRAM
bool "Environment in a non-volatile RAM"
depends on !CHAIN_OF_TRUST
help
Define this if you have some non-volatile memory device
(NVRAM, battery buffered SRAM) which you want to use for the
environment.

- CONFIG_ENV_ADDR:
- CONFIG_ENV_SIZE:

These two #defines are used to determine the memory area you
want to use for environment. It is assumed that this memory
can just be read and written to, without any special
provision.

config ENV_IS_IN_ONENAND
bool "Environment is in OneNAND"
depends on !CHAIN_OF_TRUST
help
Define this if you want to put your local device's environment in
OneNAND.

- CONFIG_ENV_ADDR:
- CONFIG_ENV_SIZE:

These two #defines are used to determine the device range you
want to use for environment. It is assumed that this memory
can just be read and written to, without any special
provision.

config ENV_IS_IN_REMOTE
bool "Environment is in remove memory space"
depends on !CHAIN_OF_TRUST
help
Define this if you have a remote memory space which you
want to use for the local device's environment.

- CONFIG_ENV_ADDR:
- CONFIG_ENV_SIZE:

These two #defines specify the address and size of the
environment area within the remote memory space. The
local device can get the environment from remote memory
space by SRIO or PCIE links.

config ENV_IS_IN_SPI_FLASH
bool "Environment is in SPI flash"
depends on !CHAIN_OF_TRUST
help
Define this if you have a SPI Flash memory device which you
want to use for the environment.

- CONFIG_ENV_OFFSET:
- CONFIG_ENV_SIZE:

These two #defines specify the offset and size of the
environment area within the SPI Flash. CONFIG_ENV_OFFSET must be
aligned to an erase sector boundary.

- CONFIG_ENV_SECT_SIZE:

Define the SPI flash's sector size.

- CONFIG_ENV_OFFSET_REDUND (optional):

This setting describes a second storage area of CONFIG_ENV_SIZE
size used to hold a redundant copy of the environment data, so
that there is a valid backup copy in case there is a power failure
during a "saveenv" operation. CONFIG_ENV_OFFSET_REDUND must be
aligned to an erase sector boundary.

- CONFIG_ENV_SPI_BUS (optional):
- CONFIG_ENV_SPI_CS (optional):

Define the SPI bus and chip select. If not defined they will be 0.

- CONFIG_ENV_SPI_MAX_HZ (optional):

Define the SPI max work clock. If not defined then use 1MHz.

- CONFIG_ENV_SPI_MODE (optional):

Define the SPI work mode. If not defined then use SPI_MODE_3.

config ENV_IS_IN_UBI
bool "Environment in a UBI volume"
depends on !CHAIN_OF_TRUST
help
Define 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_UBI_PART:

Define this to a string that is the mtd partition containing the UBI.

- CONFIG_ENV_UBI_VOLUME:

Define this to the name of the volume that you want to store the
environment in.

- CONFIG_ENV_UBI_VOLUME_REDUND:

Define this to the name of another volume to store a second copy of
the environment in. This will enable redundant environments in UBI.
It is assumed that both volumes are in the same MTD partition.

- CONFIG_UBI_SILENCE_MSG
- CONFIG_UBIFS_SILENCE_MSG

You will probably want to define these to avoid a really noisy system
when storing the env in UBI.

config ENV_IS_NOWHERE
bool "Environment is not stored"
help
Define this if you don't want to or can't have an environment stored
on a storage medium

config ENV_FAT_INTERFACE
string "Name of the block device for the environment"
depends on ENV_IS_IN_FAT
default "mmc" if TI_COMMON_CMD_OPTIONS || ARCH_ZYNQMP || ARCH_AT91
help
Define this to a string that is the name of the block device.

config ENV_FAT_DEVICE_AND_PART
string "Device and partition for where to store the environemt in FAT"
depends on ENV_IS_IN_FAT
default "0:1" if TI_COMMON_CMD_OPTIONS
default "0:auto" if ARCH_ZYNQMP
default "0" if ARCH_AT91
help
Define this to a string to specify the partition of the device. It can
be as following:

"D:P", "D:0", "D", "D:" or "D:auto" (D, P are integers. And P >= 1)
- "D:P": device D partition P. Error occurs if device D has no
partition table.
- "D:0": device D.
- "D" or "D:": device D partition 1 if device D has partition
table, or the whole device D if has no partition
table.
- "D:auto": first partition in device D with bootable flag set.
If none, first valid partition in device D. If no
partition table then means device D.

config ENV_FAT_FILE
string "Name of the FAT file to use for the environemnt"
depends on ENV_IS_IN_FAT
default "uboot.env"
help
It's a string of the FAT file name. This file use to store the
environment.

if ARCH_SUNXI

config ENV_OFFSET
hex "Environment Offset"
depends on !ENV_IS_IN_UBI
depends on !ENV_IS_NOWHERE
default 0x88000 if ARCH_SUNXI
help
Offset from the start of the device (or partition)

config ENV_SIZE
hex "Environment Size"
depends on !ENV_IS_NOWHERE
default 0x20000 if ARCH_SUNXI
help
Size of the environment storage area

config ENV_UBI_PART
string "UBI partition name"
depends on ENV_IS_IN_UBI
help
MTD partition containing the UBI device

config ENV_UBI_VOLUME
string "UBI volume name"
depends on ENV_IS_IN_UBI
help
Name of the volume that you want to store the environment in.

endif

endmenu

+ 57
- 0
env/Makefile View File

@@ -0,0 +1,57 @@
#
# (C) Copyright 2004-2006
# Wolfgang Denk, DENX Software Engineering, wd@denx.de.
#
# SPDX-License-Identifier: GPL-2.0+
#

obj-y += common.o

ifndef CONFIG_SPL_BUILD
obj-y += attr.o
obj-y += callback.o
obj-y += flags.o
obj-$(CONFIG_ENV_IS_IN_DATAFLASH) += dataflash.o
obj-$(CONFIG_ENV_IS_IN_EEPROM) += eeprom.o
extra-$(CONFIG_ENV_IS_EMBEDDED) += embedded.o
obj-$(CONFIG_ENV_IS_IN_EEPROM) += embedded.o
extra-$(CONFIG_ENV_IS_IN_FLASH) += embedded.o
obj-$(CONFIG_ENV_IS_IN_NVRAM) += embedded.o
obj-$(CONFIG_ENV_IS_IN_FLASH) += flash.o
obj-$(CONFIG_ENV_IS_IN_MMC) += mmc.o
obj-$(CONFIG_ENV_IS_IN_FAT) += fat.o
obj-$(CONFIG_ENV_IS_IN_EXT4) += ext4.o
obj-$(CONFIG_ENV_IS_IN_NAND) += nand.o
obj-$(CONFIG_ENV_IS_IN_NVRAM) += nvram.o
obj-$(CONFIG_ENV_IS_IN_ONENAND) += onenand.o
obj-$(CONFIG_ENV_IS_IN_SATA) += sata.o
obj-$(CONFIG_ENV_IS_IN_SPI_FLASH) += sf.o
obj-$(CONFIG_ENV_IS_IN_REMOTE) += remote.o
obj-$(CONFIG_ENV_IS_IN_UBI) += ubi.o
obj-$(CONFIG_ENV_IS_NOWHERE) += nowhere.o
endif

ifdef CONFIG_SPL_BUILD
obj-$(CONFIG_ENV_IS_IN_FLASH) += flash.o
# environment
ifdef CONFIG_TPL_BUILD
obj-$(CONFIG_TPL_ENV_SUPPORT) += attr.o
obj-$(CONFIG_TPL_ENV_SUPPORT) += flags.o
obj-$(CONFIG_TPL_ENV_SUPPORT) += callback.o
else
obj-$(CONFIG_SPL_ENV_SUPPORT) += attr.o
obj-$(CONFIG_SPL_ENV_SUPPORT) += flags.o
obj-$(CONFIG_SPL_ENV_SUPPORT) += callback.o
endif
ifneq ($(CONFIG_TPL_ENV_SUPPORT)$(CONFIG_SPL_ENV_SUPPORT),)
obj-$(CONFIG_ENV_IS_NOWHERE) += nowhere.o
obj-$(CONFIG_ENV_IS_IN_MMC) += mmc.o
obj-$(CONFIG_ENV_IS_IN_FAT) += fat.o
obj-$(CONFIG_ENV_IS_IN_EXT4) += ext4.o
obj-$(CONFIG_ENV_IS_IN_NAND) += nand.o
obj-$(CONFIG_ENV_IS_IN_SPI_FLASH) += sf.o
obj-$(CONFIG_ENV_IS_IN_FLASH) += flash.o
endif
endif

CFLAGS_embedded.o := -Wa,--no-warn -DENV_CRC=$(shell tools/envcrc 2>/dev/null)

common/env_attr.c → env/attr.c View File


common/env_callback.c → env/callback.c View File


common/env_common.c → env/common.c View File


common/env_dataflash.c → env/dataflash.c View File


common/env_eeprom.c → env/eeprom.c View File


common/env_embedded.c → env/embedded.c View File


common/env_ext4.c → env/ext4.c View File


common/env_fat.c → env/fat.c View File


common/env_flags.c → env/flags.c View File


common/env_flash.c → env/flash.c View File


common/env_mmc.c → env/mmc.c View File


common/env_nand.c → env/nand.c View File


common/env_nowhere.c → env/nowhere.c View File


common/env_nvram.c → env/nvram.c View File


common/env_onenand.c → env/onenand.c View File


common/env_remote.c → env/remote.c View File


common/env_sata.c → env/sata.c View File


common/env_sf.c → env/sf.c View File


common/env_ubi.c → env/ubi.c View File


+ 2
- 2
include/configs/M5208EVBE.h View File

@@ -161,8 +161,8 @@
#define CONFIG_ENV_SECT_SIZE 0x2000

#define LDS_BOARD_TEXT \
. = DEFINED(env_offset) ? env_offset : .; \
common/env_embedded.o (.text*);
. = DEFINED(env_offset) ? env_offset : .; \
env/embedded.o(.text*);

/* Cache Configuration */
#define CONFIG_SYS_CACHELINE_SIZE 16


+ 1
- 1
include/configs/M5235EVB.h View File

@@ -176,7 +176,7 @@

#define LDS_BOARD_TEXT \
. = DEFINED(env_offset) ? env_offset : .; \
common/env_embedded.o (.text);
env/embedded.o(.text);

#ifdef NORFLASH_PS32BIT
# define CONFIG_ENV_OFFSET (0x8000)


+ 2
- 2
include/configs/M5249EVB.h View File

@@ -85,8 +85,8 @@
#define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_GBL_DATA_OFFSET

#define LDS_BOARD_TEXT \
. = DEFINED(env_offset) ? env_offset : .; \
common/env_embedded.o (.text);
. = DEFINED(env_offset) ? env_offset : .; \
env/embedded.o(.text);

#define CONFIG_ENV_OFFSET 0x4000 /* Address of Environment Sector*/
#define CONFIG_ENV_SIZE 0x2000 /* Total Size of Environment Sector */


+ 2
- 2
include/configs/M5253DEMO.h View File

@@ -29,8 +29,8 @@
#endif

#define LDS_BOARD_TEXT \
. = DEFINED(env_offset) ? env_offset : .; \
common/env_embedded.o (.text*);
. = DEFINED(env_offset) ? env_offset : .; \
env/embedded.o(.text*);

/*
* Command line configuration.


+ 1
- 1
include/configs/M5253EVBE.h View File

@@ -31,7 +31,7 @@

#define LDS_BOARD_TEXT \
. = DEFINED(env_offset) ? env_offset : .; \
common/env_embedded.o (.text)
env/embedded.o(.text)

/*
* BOOTP options


+ 2
- 2
include/configs/M5272C3.h View File

@@ -39,8 +39,8 @@
#endif

#define LDS_BOARD_TEXT \
. = DEFINED(env_offset) ? env_offset : .; \
common/env_embedded.o (.text);
. = DEFINED(env_offset) ? env_offset : .; \
env/embedded.o(.text);

/*
* BOOTP options


+ 2
- 2
include/configs/M5275EVB.h View File

@@ -40,8 +40,8 @@
#endif

#define LDS_BOARD_TEXT \
. = DEFINED(env_offset) ? env_offset : .; \
common/env_embedded.o (.text);
. = DEFINED(env_offset) ? env_offset : .; \
env/embedded.o(.text);

/*
* BOOTP options


+ 1
- 1
include/configs/M5282EVB.h View File

@@ -32,7 +32,7 @@

#define LDS_BOARD_TEXT \
. = DEFINED(env_offset) ? env_offset : .; \
common/env_embedded.o (.text*);
env/embedded.o(.text*);

/*
* BOOTP options


+ 1
- 1
include/configs/M53017EVB.h View File

@@ -183,7 +183,7 @@

#define LDS_BOARD_TEXT \
. = DEFINED(env_offset) ? env_offset : .; \
common/env_embedded.o (.text*)
env/embedded.o(.text*)

/*-----------------------------------------------------------------------
* Cache Configuration


+ 2
- 2
include/configs/M5329EVB.h View File

@@ -185,8 +185,8 @@
#define CONFIG_ENV_SECT_SIZE 0x2000

#define LDS_BOARD_TEXT \
. = DEFINED(env_offset) ? env_offset : .; \
common/env_embedded.o (.text*);
. = DEFINED(env_offset) ? env_offset : .; \
env/embedded.o(.text*);

/*-----------------------------------------------------------------------
* Cache Configuration


+ 2
- 2
include/configs/M5373EVB.h View File

@@ -185,8 +185,8 @@
#define CONFIG_ENV_SECT_SIZE 0x2000

#define LDS_BOARD_TEXT \
. = DEFINED(env_offset) ? env_offset : .; \
common/env_embedded.o (.text*);
. = DEFINED(env_offset) ? env_offset : .; \
env/embedded.o(.text*);

/*-----------------------------------------------------------------------
* Cache Configuration


+ 2
- 2
include/configs/amcore.h View File

@@ -93,8 +93,8 @@
#define CONFIG_ENV_SECT_SIZE 0x1000

#define LDS_BOARD_TEXT \
. = DEFINED(env_offset) ? env_offset : .; \
common/env_embedded.o (.text*);
. = DEFINED(env_offset) ? env_offset : .; \
env/embedded.o(.text*);

/* memory map space for linux boot data */
#define CONFIG_SYS_BOOTMAPSZ (8 << 20)


+ 1
- 1
include/configs/astro_mcf5373l.h View File

@@ -296,7 +296,7 @@

#define LDS_BOARD_TEXT \
. = DEFINED(env_offset) ? env_offset : .; \
common/env_embedded.o (.text*)
env/embedded.o(.text*)

#if ENABLE_JFFS
/* JFFS Partition offset set */


+ 2
- 2
include/configs/cobra5272.h View File

@@ -102,8 +102,8 @@
#endif

#define LDS_BOARD_TEXT \
. = DEFINED(env_offset) ? env_offset : .; \
common/env_embedded.o (.text);
. = DEFINED(env_offset) ? env_offset : .; \
env/embedded.o(.text);

/*
* BOOTP options


+ 2
- 2
scripts/Makefile.spl View File

@@ -69,10 +69,10 @@ libs-y += common/init/

# Special handling for a few options which support SPL/TPL
ifeq ($(CONFIG_TPL_BUILD),y)
libs-$(CONFIG_TPL_LIBCOMMON_SUPPORT) += common/ cmd/
libs-$(CONFIG_TPL_LIBCOMMON_SUPPORT) += common/ cmd/ env/
libs-$(CONFIG_TPL_LIBGENERIC_SUPPORT) += lib/
else
libs-$(CONFIG_SPL_LIBCOMMON_SUPPORT) += common/ cmd/
libs-$(CONFIG_SPL_LIBCOMMON_SUPPORT) += common/ cmd/ env/
libs-$(CONFIG_SPL_LIBGENERIC_SUPPORT) += lib/
endif



+ 2
- 2
tools/Makefile View File

@@ -37,7 +37,7 @@ hostprogs-$(CONFIG_VIDEO_LOGO) += bmp_logo
HOSTCFLAGS_bmp_logo.o := -pedantic

hostprogs-$(CONFIG_BUILD_ENVCRC) += envcrc
envcrc-objs := envcrc.o lib/crc32.o common/env_embedded.o lib/sha1.o
envcrc-objs := envcrc.o lib/crc32.o env/embedded.o lib/sha1.o

hostprogs-$(CONFIG_CMD_NET) += gen_eth_addr
HOSTCFLAGS_gen_eth_addr.o := -pedantic
@@ -225,7 +225,7 @@ HOSTCFLAGS_sha256.o := -pedantic
quiet_cmd_wrap = WRAP $@
cmd_wrap = echo "\#include <../$(patsubst $(obj)/%,%,$@)>" >$@

$(obj)/lib/%.c $(obj)/common/%.c:
$(obj)/lib/%.c $(obj)/common/%.c $(obj)/env/%.c:
$(call cmd,wrap)

clean-dirs := lib common