summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenis Pynkin <denis.pynkin@collabora.com>2020-09-15 14:37:14 +0300
committerStefano Babic <sbabic@denx.de>2020-09-17 14:40:40 +0200
commit1189bd513ca376a0f1b357bb0ffec7ae22ace717 (patch)
treeedce3cdfe7de8f6b76fae5896d3c728291515cba
parent0098222dacd6fd2bdc6f99adc366397a7ed8bb6a (diff)
downloadu-boot-1189bd513ca376a0f1b357bb0ffec7ae22ace717.tar.gz
mx6qsabrelite: increase the environment offset
The size of the binary created with the default U-boot config is much greater than the default offset for environment `0x60000`. In case if that binary is used for booting via MMC it is overlapped with the environment stored on MMC. This leads to U-Boot corruption while saving environment with `saveenv` command and non-bootable SabreLite board. The offset for environment `CONFIG_ENV_OFFSET=0x60000` was added in commit a09fea1 but did not count in the change to `0xC0000` if option `CONFIG_ENV_IS_IN_MMC` is used. The offset is also used for variant with environment saving onto SPI NOR flash (with enabled option `CONFIG_ENV_IS_IN_SPI_FLASH`). In that case the U-Boot binary flashed on SPI NOR is also corrupted after environment saving with the original 0x60000 offset. Signed-off-by: Denis Pynkin <denis.pynkin@collabora.com> Reviewed-by: Tom Rini <trini@konsulko.com>
-rw-r--r--configs/mx6qsabrelite_defconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/configs/mx6qsabrelite_defconfig b/configs/mx6qsabrelite_defconfig
index 008fcfe04c..6e7193e411 100644
--- a/configs/mx6qsabrelite_defconfig
+++ b/configs/mx6qsabrelite_defconfig
@@ -4,7 +4,7 @@ CONFIG_SYS_TEXT_BASE=0x17800000
CONFIG_SYS_MALLOC_F_LEN=0x4000
CONFIG_NR_DRAM_BANKS=1
CONFIG_ENV_SIZE=0x2000
-CONFIG_ENV_OFFSET=0x60000
+CONFIG_ENV_OFFSET=0xC0000
CONFIG_MX6Q=y
CONFIG_TARGET_NITROGEN6X=y
CONFIG_DM_GPIO=y