nios2: Calculate the env position from monitor size

Reorder the 10m50 and 3c120 config files such, that the environment
position can be calculated from the monitor size. The environment is
placed right after the monitor. This removes one more ad-hoc variable.

Signed-off-by: Marek Vasut <marex@denx.de>
Signed-off-by: Thomas Chou <thomas@wytron.com.tw>

diff --git a/include/configs/10m50_devboard.h b/include/configs/10m50_devboard.h
index 8a91cdbd2290e7d0e0681425c496b8afbe3f2751..c99177c6fe6bde838dbaf03a9f6820af4bacdedf 100644 (file)
--- a/include/configs/10m50_devboard.h
+++ b/include/configs/10m50_devboard.h
@@ -53,19 +53,6 @@
 #define CONFIG_OF_BOARD_SETUP
 #define CONFIG_LMB
 
-/*
- * ENVIRONMENT -- Put environment in sector CONFIG_SYS_MONITOR_LEN above
- * CONFIG_SYS_RESET_ADDR, since we assume the monitor is stored at the
- * reset address, no? This will keep the environment in user region
- * of flash. NOTE: the monitor length must be multiple of sector size
- * (which is common practice).
- */
-#define CONFIG_ENV_IS_IN_FLASH
-
-#define CONFIG_ENV_SIZE                        0x10000 /* 64k, 1 sector */
-#define CONFIG_ENV_OVERWRITE           /* Serial change Ok     */
-#define CONFIG_ENV_ADDR                        0xf4040000
-
 /*
  * MEMORY ORGANIZATION
  * -Monitor at top of sdram.
@@ -82,6 +69,19 @@
                                         CONFIG_SYS_MONITOR_LEN)
 #define CONFIG_SYS_MALLOC_LEN          0x20000
 
+/*
+ * ENVIRONMENT -- Put environment in sector CONFIG_SYS_MONITOR_LEN above
+ * CONFIG_SYS_RESET_ADDR, since we assume the monitor is stored at the
+ * reset address, no? This will keep the environment in user region
+ * of flash. NOTE: the monitor length must be multiple of sector size
+ * (which is common practice).
+ */
+#define CONFIG_ENV_IS_IN_FLASH
+
+#define CONFIG_ENV_SIZE                        0x10000 /* 64k, 1 sector */
+#define CONFIG_ENV_OVERWRITE           /* Serial change Ok     */
+#define CONFIG_ENV_ADDR                        (0xf4000000 + CONFIG_SYS_MONITOR_LEN)
+
 /*
  * MISC
  */

diff --git a/include/configs/3c120_devboard.h b/include/configs/3c120_devboard.h
index 2ecdd5d8963efea5b3880a692044a49350c6c38f..0f494e54d6bf349c136bca46660c065b75c6a38f 100644 (file)
--- a/include/configs/3c120_devboard.h
+++ b/include/configs/3c120_devboard.h
@@ -56,19 +56,6 @@
 #define CONFIG_OF_BOARD_SETUP
 #define CONFIG_LMB
 
-/*
- * ENVIRONMENT -- Put environment in sector CONFIG_SYS_MONITOR_LEN above
- * CONFIG_SYS_RESET_ADDR, since we assume the monitor is stored at the
- * reset address, no? This will keep the environment in user region
- * of flash. NOTE: the monitor length must be multiple of sector size
- * (which is common practice).
- */
-#define CONFIG_ENV_IS_IN_FLASH
-
-#define CONFIG_ENV_SIZE                        0x20000 /* 128k, 1 sector */
-#define CONFIG_ENV_OVERWRITE           /* Serial change Ok     */
-#define CONFIG_ENV_ADDR                        0xe2840000
-
 /*
  * MEMORY ORGANIZATION
  * -Monitor at top of sdram.
@@ -85,6 +72,19 @@
                                         CONFIG_SYS_MONITOR_LEN)
 #define CONFIG_SYS_MALLOC_LEN          0x20000
 
+/*
+ * ENVIRONMENT -- Put environment in sector CONFIG_SYS_MONITOR_LEN above
+ * CONFIG_SYS_RESET_ADDR, since we assume the monitor is stored at the
+ * reset address, no? This will keep the environment in user region
+ * of flash. NOTE: the monitor length must be multiple of sector size
+ * (which is common practice).
+ */
+#define CONFIG_ENV_IS_IN_FLASH
+
+#define CONFIG_ENV_SIZE                        0x20000 /* 128k, 1 sector */
+#define CONFIG_ENV_OVERWRITE           /* Serial change Ok     */
+#define CONFIG_ENV_ADDR                        (0xe2800000 + CONFIG_SYS_MONITOR_LEN)
+
 /*
  * MISC
  */