diff options
| author | Michal Simek <michal.simek@xilinx.com> | 2018-07-19 08:45:45 +0200 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-08-19 12:14:38 -0400 |
| commit | 4aee624c927519fc9edc79ccc247486ac3f68392 (patch) | |
| tree | 82f0ab5820a8c6a9f431d7299a83ba285d05346b /env/Kconfig | |
| parent | 9f8cf76be256a83643ee05de6cffaeb452ed0931 (diff) | |
| download | u-boot-4aee624c927519fc9edc79ccc247486ac3f68392.tar.gz u-boot-4aee624c927519fc9edc79ccc247486ac3f68392.tar.bz2 u-boot-4aee624c927519fc9edc79ccc247486ac3f68392.zip | |
env: Merge Rockchip, Sunxi, Zynq and ZynqMP
There is no reason to have the same Kconfig options for different SoCs
separately. The patch is merging them together.
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Acked-by: Maxime Ripard <maxime.ripard@bootlin.com>
[trini: Fix ENV_SIZE around ENV_IS_NOWHERE]
Signed-off-by: Tom Rini <trini@konsulko.com>
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'env/Kconfig')
| -rw-r--r-- | env/Kconfig | 64 |
1 files changed, 15 insertions, 49 deletions
diff --git a/env/Kconfig b/env/Kconfig index be99efb937..f23be00a54 100644 --- a/env/Kconfig +++ b/env/Kconfig @@ -431,23 +431,35 @@ config ENV_EXT4_FILE It's a string of the EXT4 file name. This file use to store the environment (explicit path to the file) -if ARCH_SUNXI +if ARCH_ROCKCHIP || ARCH_SUNXI || ARCH_ZYNQ || ARCH_ZYNQMP config ENV_OFFSET hex "Environment Offset" depends on !ENV_IS_IN_UBI depends on !ENV_IS_NOWHERE + default 0x3f8000 if ARCH_ROCKCHIP default 0x88000 if ARCH_SUNXI + default 0xE0000 if ARCH_ZYNQ + default 0x1E00000 if ARCH_ZYNQMP 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 + default 0x40000 if ENV_IS_IN_SPI_FLASH && ARCH_ZYNQMP + default 0x20000 if ARCH_SUNXI || ARCH_ZYNQ + default 0x8000 if ARCH_ROCKCHIP || ARCH_ZYNQMP help Size of the environment storage area +config ENV_SECT_SIZE + hex "Environment Sector-Size" + depends on !ENV_IS_NOWHERE && (ARCH_ZYNQ || ARCH_ZYNQMP) + default 0x40000 if ARCH_ZYNQMP + default 0x20000 if ARCH_ZYNQ + help + Size of the sector containing the environment. + config ENV_UBI_PART string "UBI partition name" depends on ENV_IS_IN_UBI @@ -462,52 +474,6 @@ config ENV_UBI_VOLUME endif -if ARCH_ROCKCHIP - -config ENV_OFFSET - hex - depends on !ENV_IS_IN_UBI - depends on !ENV_IS_NOWHERE - default 0x3f8000 - help - Offset from the start of the device (or partition) - -config ENV_SIZE - hex - default 0x8000 - help - Size of the environment storage area - -endif - -if ARCH_ZYNQMP || ARCH_ZYNQ - -config ENV_OFFSET - hex "Environment Offset" - depends on !ENV_IS_NOWHERE - default 0x1E00000 if ARCH_ZYNQMP - default 0xE0000 if ARCH_ZYNQ - help - Offset from the start of the device (or partition) - -config ENV_SIZE - hex "Environment Size" - default 0x40000 if ENV_IS_IN_SPI_FLASH && ARCH_ZYNQMP - default 0x8000 if ARCH_ZYNQMP - default 0x20000 if ARCH_ZYNQ - help - Size of the environment storage area. - -config ENV_SECT_SIZE - hex "Environment Sector-Size" - depends on !ENV_IS_NOWHERE - default 0x40000 if ARCH_ZYNQMP - default 0x20000 if ARCH_ZYNQ - help - Size of the sector containing the environment. - -endif - config USE_DEFAULT_ENV_FILE bool "Create default environment from file" help |