summaryrefslogtreecommitdiff
path: root/include/configs/qemu-mips64.h
diff options
context:
space:
mode:
authorKyle Edwards <kyleedwardsny@gmail.com>2017-04-12 22:42:31 -0400
committerDaniel Schwierzeck <daniel.schwierzeck@gmail.com>2017-04-21 13:54:47 +0200
commit9828d050cf5026b27c6acdf615c5161b5a269092 (patch)
tree3c365470f12f4daafd7c11cdc3cd6e83917b5832 /include/configs/qemu-mips64.h
parentf6c1df44b815a08585e7fd3805a1db51a5955d09 (diff)
mips: qemu-mips/64: Remove obsolete CONFIG_SYS_MONITOR_LEN from config
This fixes an issue with the saveenv command causing U-Boot to no longer work on the QEMU Mips pseudoboard. Because the offset of the environment was being determined by CONFIG_SYS_MONITOR_LEN, and this value was less than the actual size of U-Boot, saveenv was overwriting parts of the U-Boot code. Because CONFIG_SYS_MONITOR_LEN is no longer used on MIPS, this patch removes it and places the environment at the end of the pseudoboard's 4MB flash. Signed-off-by: Kyle Edwards <kyleedwardsny@gmail.com> Cc: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
Diffstat (limited to 'include/configs/qemu-mips64.h')
-rw-r--r--include/configs/qemu-mips64.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/include/configs/qemu-mips64.h b/include/configs/qemu-mips64.h
index 39afbff2d8..4856087718 100644
--- a/include/configs/qemu-mips64.h
+++ b/include/configs/qemu-mips64.h
@@ -102,7 +102,6 @@
*/
/* The following #defines are needed to get flash environment right */
#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE
-#define CONFIG_SYS_MONITOR_LEN (192 << 10)
#define CONFIG_SYS_INIT_SP_OFFSET 0x400000
@@ -115,10 +114,10 @@
#define CONFIG_SYS_FLASH_USE_BUFFER_WRITE
#define CONFIG_ENV_IS_IN_FLASH
-#define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + CONFIG_SYS_MONITOR_LEN)
/* Address and size of Primary Environment Sector */
#define CONFIG_ENV_SIZE 0x8000
+#define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + (4 << 20) - CONFIG_ENV_SIZE)
#define CONFIG_ENV_OVERWRITE 1