ARC: Move ENV_SIZE and ENV_OFFSET to Kconfig

Join the party of some ARM boards and drop more
items from include/configs/xxx.h.

Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
Cc: Michal Simek <michal.simek@xilinx.com>
Cc: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>

diff --git a/configs/emsdp_defconfig b/configs/emsdp_defconfig
index 273334b05d213f5e62c5463509b329db0d95d2be..64281d0529dff38c8823beb8fb17dd57c0b98bda 100644 (file)
--- a/configs/emsdp_defconfig
+++ b/configs/emsdp_defconfig
@@ -3,6 +3,7 @@ CONFIG_ISA_ARCV2=y
 CONFIG_CPU_ARCEM6=y
 CONFIG_TARGET_EMSDP=y
 CONFIG_SYS_TEXT_BASE=0x00000000
+CONFIG_ENV_SIZE=0x1000
 CONFIG_SYS_CLK_FREQ=40000000
 # CONFIG_ARCH_FIXUP_FDT_MEMORY is not set
 CONFIG_VERSION_VARIABLE=y

diff --git a/configs/iot_devkit_defconfig b/configs/iot_devkit_defconfig
index 1b6dd9e55ad20c14656c6c86105b9f3b57bfe821..24bbe3fc5df305748bbb94b36ce093d1b3f9e868 100644 (file)
--- a/configs/iot_devkit_defconfig
+++ b/configs/iot_devkit_defconfig
@@ -5,6 +5,7 @@ CONFIG_SYS_ICACHE_OFF=y
 CONFIG_SYS_DCACHE_OFF=y
 CONFIG_TARGET_IOT_DEVKIT=y
 CONFIG_SYS_TEXT_BASE=0x00000000
+CONFIG_ENV_SIZE=0x1000
 CONFIG_SYS_CLK_FREQ=16000000
 CONFIG_LOCALVERSION="-iotdk-1.0"
 # CONFIG_ARCH_FIXUP_FDT_MEMORY is not set

diff --git a/configs/tb100_defconfig b/configs/tb100_defconfig
index f30053d4deefcef72605638310df58ca40af9b8c..e3837d92e7fabe7271411e52f18d26406e35a4eb 100644 (file)
--- a/configs/tb100_defconfig
+++ b/configs/tb100_defconfig
@@ -1,6 +1,7 @@
 CONFIG_ARC=y
 CONFIG_TARGET_TB100=y
 CONFIG_SYS_TEXT_BASE=0x84000000
+CONFIG_ENV_SIZE=0x800
 CONFIG_SYS_CLK_FREQ=500000000
 CONFIG_BOOTDELAY=3
 CONFIG_USE_BOOTARGS=y

diff --git a/env/Kconfig b/env/Kconfig
index 9011109b47b781f30220f1c8b8296ac3d32de2f8..c22cbbdadcb6cae865685356a5873b8d03474c0d 100644 (file)
--- a/env/Kconfig
+++ b/env/Kconfig
@@ -431,7 +431,7 @@ 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_ROCKCHIP || ARCH_SUNXI || ARCH_ZYNQ || ARCH_ZYNQMP || ARCH_VERSAL
+if ARCH_ROCKCHIP || ARCH_SUNXI || ARCH_ZYNQ || ARCH_ZYNQMP || ARCH_VERSAL || ARC
 
 config ENV_OFFSET
        hex "Environment Offset"
@@ -441,6 +441,7 @@ config ENV_OFFSET
        default 0x88000 if ARCH_SUNXI
        default 0xE0000 if ARCH_ZYNQ
        default 0x1E00000 if ARCH_ZYNQMP
+       default 0 if ARC
        help
          Offset from the start of the device (or partition)
 
@@ -449,6 +450,7 @@ config ENV_SIZE
        default 0x40000 if ENV_IS_IN_SPI_FLASH && ARCH_ZYNQMP
        default 0x20000 if ARCH_SUNXI || ARCH_ZYNQ
        default 0x8000 if ARCH_ROCKCHIP || ARCH_ZYNQMP || ARCH_VERSAL
+       default 0x4000 if ARC
        help
          Size of the environment storage area
 

diff --git a/include/configs/axs10x.h b/include/configs/axs10x.h
index 1224815a925d12feac20e4167e91bfd8be56094b..e128d1c08baf8030490cc4412b557dc605c7b35d 100644 (file)
--- a/include/configs/axs10x.h
+++ b/include/configs/axs10x.h
@@ -62,7 +62,6 @@
 /*
  * Environment settings
  */
-#define CONFIG_ENV_SIZE                        SZ_16K
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "upgrade=if mmc rescan && " \
                "fatload mmc 0:1 ${loadaddr} u-boot-update.img && " \

diff --git a/include/configs/emsdp.h b/include/configs/emsdp.h
index e6b246914885cdb622e353b2e5e4223c3d082d0b..a872d48154a4eff49747a911757314efb36f302e 100644 (file)
--- a/include/configs/emsdp.h
+++ b/include/configs/emsdp.h
@@ -21,7 +21,6 @@
 /*
  * Environment
  */
-#define CONFIG_ENV_SIZE                        SZ_4K
 #define CONFIG_BOOTFILE                        "app.bin"
 #define CONFIG_LOADADDR                        CONFIG_SYS_LOAD_ADDR
 

diff --git a/include/configs/hsdk.h b/include/configs/hsdk.h
index 92cf3a109edb0ad2d856a212c3514fbfe6d2f004..9af1d12701cad6184213577d23b5069132696fdb 100644 (file)
--- a/include/configs/hsdk.h
+++ b/include/configs/hsdk.h
@@ -57,8 +57,6 @@
 /*
  * Environment settings
  */
-#define CONFIG_ENV_SIZE                        SZ_16K
-
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "upgrade=if mmc rescan && " \
                "fatload mmc 0:1 ${loadaddr} u-boot-update.scr && " \

diff --git a/include/configs/iot_devkit.h b/include/configs/iot_devkit.h
index cd1309d4b9848224004275bdafeef7564b313aeb..1ba69d9a5d0de6019ea11fb6c6b7cd7667042074 100644 (file)
--- a/include/configs/iot_devkit.h
+++ b/include/configs/iot_devkit.h
@@ -74,7 +74,6 @@
 /*
  * Environment
  */
-#define CONFIG_ENV_SIZE                        SZ_4K
 #define CONFIG_BOOTFILE                        "app.bin"
 #define CONFIG_LOADADDR                        CONFIG_SYS_LOAD_ADDR
 

diff --git a/include/configs/nsim.h b/include/configs/nsim.h
index c3f34a91e433d57a126bd0f90a14ddd0a35a87f4..61217bbe7956d2c7757301a2251e5823b99aa6b6 100644 (file)
--- a/include/configs/nsim.h
+++ b/include/configs/nsim.h
@@ -24,12 +24,6 @@
 #define CONFIG_SYS_BOOTM_LEN           SZ_32M
 #define CONFIG_SYS_LOAD_ADDR           0x82000000
 
-/*
- * Environment settings
- */
-#define CONFIG_ENV_SIZE                        SZ_512
-#define CONFIG_ENV_OFFSET              0
-
 /*
  * Environment configuration
  */

diff --git a/include/configs/tb100.h b/include/configs/tb100.h
index 96e5b6315c5e039124a0b53a8baf954099efe974..a761c373352c83786a52aed1af02da5643a75a58 100644 (file)
--- a/include/configs/tb100.h
+++ b/include/configs/tb100.h
@@ -52,12 +52,6 @@
  * Command line configuration
  */
 
-/*
- * Environment settings
- */
-#define CONFIG_ENV_SIZE                        SZ_2K
-#define CONFIG_ENV_OFFSET              0
-
 /*
  * Environment configuration
  */