From: Tom Rini Date: Thu, 14 Nov 2019 09:54:13 -0500 Subject: [U-Boot] [PATCH 3/5] smart-gateway-mt7688: Correct build time check for overwriting factory data In-Reply-To: <20191114145415.13187-1-trini@konsulko.com> References: <20191114145415.13187-1-trini@konsulko.com> Message-ID: <20191114145415.13187-3-trini@konsulko.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de The board file has a build time check to ensure that we do not have the redundant environment overwriting the factory data. However, multiplying the redundant offset by two isn't correct. Since we correctly confirm that U-Boot itself will not go in to the primary environment we only need to next make sure that the redundant environment + the size of that does not exceed where the factory data is. Cc: Stefan Roese Signed-off-by: Tom Rini --- board/gardena/smart-gateway-mt7688/board.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/gardena/smart-gateway-mt7688/board.c b/board/gardena/smart-gateway-mt7688/board.c index 7b9570714342..e9ffd42a8a68 100644 --- a/board/gardena/smart-gateway-mt7688/board.c +++ b/board/gardena/smart-gateway-mt7688/board.c @@ -18,7 +18,7 @@ #define FACTORY_DATA_OFFS 0xc0000 #define FACTORY_DATA_SECT_SIZE 0x10000 -#if ((CONFIG_ENV_OFFSET_REDUND * 2) > FACTORY_DATA_OFFS) +#if ((CONFIG_ENV_OFFSET_REDUND + CONFIG_ENV_SIZE) > FACTORY_DATA_OFFS) #error "U-Boot image with environment too big (overlapping with factory-data)!" #endif #define FACTORY_DATA_USER_OFFS 0x140 -- 2.17.1