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>

diff --git a/env/Kconfig b/env/Kconfig
index be99efb93700a4ead0488fa03f0345ee9ddefff9..f23be00a547fd43c4b127778b73000e56a3105c2 100644 (file)
--- 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

diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
index 2adf80464f8ec0ec282a924989df4b1a45265639..9819d9980cea9ce09e1969d8620231a43c5151c2 100644 (file)
--- a/include/configs/sunxi-common.h
+++ b/include/configs/sunxi-common.h
@@ -153,8 +153,6 @@
 #define CONFIG_SYS_MMC_ENV_DEV         0
 #endif
 #define CONFIG_SYS_MMC_MAX_DEVICE      4
-#elif defined(CONFIG_ENV_IS_NOWHERE)
-#define CONFIG_ENV_SIZE                        (128 << 10)
 #endif
 
 #ifndef CONFIG_MACH_SUN8I_V3S