diff options
| author | Fabio Estevam <festevam@gmail.com> | 2019-12-19 13:52:39 -0300 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2019-12-27 12:14:02 +0100 |
| commit | 89c832cfe7b63c074583cbd6a582ccede6f437b2 (patch) | |
| tree | e62a3dcd5a94eb5d52e17c07dac4d2855f4a2b84 | |
| parent | d7cd860c22c1403a554012fd2bf7983ade0acc26 (diff) | |
| download | u-boot-89c832cfe7b63c074583cbd6a582ccede6f437b2.tar.gz | |
mx51evk: Fix U-Boot corruption after saving the environment
U-Boot binary has grown in such a way that it goes beyond the reserved
area for the environment variables.
Running "saveenv" followed by a "reset" causes U-Boot to hang because
of this overlap.
Fix this problem by increasing the CONFIG_ENV_OFFSET size.
Also, in order to prevent this same problem to happen in the future,
use CONFIG_BOARD_SIZE_LIMIT, which will detect the overlap in build-time.
CONFIG_BOARD_SIZE_LIMIT does not accept math expressions, so declare
CONFIG_ENV_OFFSET with its direct value instead.
Signed-off-by: Fabio Estevam <festevam@gmail.com>
| -rw-r--r-- | configs/mx51evk_defconfig | 2 | ||||
| -rw-r--r-- | include/configs/mx51evk.h | 13 |
2 files changed, 14 insertions, 1 deletions
diff --git a/configs/mx51evk_defconfig b/configs/mx51evk_defconfig index 1505459259..a2af8ae7b2 100644 --- a/configs/mx51evk_defconfig +++ b/configs/mx51evk_defconfig @@ -3,7 +3,7 @@ CONFIG_ARCH_MX5=y CONFIG_SYS_TEXT_BASE=0x97800000 CONFIG_TARGET_MX51EVK=y CONFIG_ENV_SIZE=0x2000 -CONFIG_ENV_OFFSET=0x60000 +CONFIG_ENV_OFFSET=0xC0000 CONFIG_NR_DRAM_BANKS=1 # CONFIG_CMD_BMODE is not set CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx51evk/imximage.cfg" diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h index 71ff789381..10aa1bcd87 100644 --- a/include/configs/mx51evk.h +++ b/include/configs/mx51evk.h @@ -182,6 +182,19 @@ /*----------------------------------------------------------------------- * environment organization */ + +/* + * Environment starts at CONFIG_ENV_OFFSET=0xC0000 = 768k = 768 * 1024 = 786432 + * + * Detect overlap between U-Boot image and environment area in build-time + * + * CONFIG_BOARD_SIZE_LIMIT = CONFIG_ENV_OFFSET - u-boot.imx offset + * CONFIG_BOARD_SIZE_LIMIT = 768k - 1k = 767k = 785408 + * + * Currently CONFIG_BOARD_SIZE_LIMIT does not handle expressions, so + * write the direct value here + */ +#define CONFIG_BOARD_SIZE_LIMIT 785408 #define CONFIG_SYS_MMC_ENV_DEV 0 #endif |