From a134d680ea32f3584e82253c68176d645dae62dc Mon Sep 17 00:00:00 2001 From: Aditya Prayoga Date: Wed, 5 Dec 2018 00:57:20 +0800 Subject: [PATCH] arm: mvebu: helios4: mmc: move environment before 1M Store the environment before 1M into the block device. This constant is easier to remember, saves a little space, and is in line with what SolidRun's 2018.01-based fork does for the clearfog. Signed-off-by: Josua Mayer [ Aditya Prayoga: * Port forward] Signed-off-by: Aditya Prayoga Reviewed-by: Stefan Roese Tested-By: Dennis Gilmore Reviewed-By: Dennis Gilmore Signed-off-by: Stefan Roese --- include/configs/helios4.h | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/include/configs/helios4.h b/include/configs/helios4.h index ce912ea324..c71055f384 100644 --- a/include/configs/helios4.h +++ b/include/configs/helios4.h @@ -46,14 +46,9 @@ /* Environment in MMC */ #define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_ENV_SECT_SIZE 0x200 -#define CONFIG_ENV_SIZE 0x10000 -/* - * For SD - reserve 1 LBA for MBR + 1M for u-boot image. The MMC/eMMC - * boot image starts @ LBA-0. - * As result in MMC/eMMC case it will be a 1 sector gap between u-boot - * image and environment - */ -#define CONFIG_ENV_OFFSET 0xf0000 +#define CONFIG_ENV_SIZE 0x2000 +/* stay within first 1M */ +#define CONFIG_ENV_OFFSET (SZ_1M - CONFIG_ENV_SIZE) #define CONFIG_ENV_ADDR CONFIG_ENV_OFFSET #define CONFIG_PHY_MARVELL /* there is a marvell phy */ -- 2.39.5