From: Manuel Reis Date: Wed, 25 Nov 2020 10:16:20 +0000 Subject: [PATCH] add check for ignored CONFIG_ENV_EXT4_DEVICE_AND_PART definition In-Reply-To: <20201125101620.59718-1-mluis.reis@gmail.com> References: <20201125101620.59718-1-mluis.reis@gmail.com> Message-ID: <20201125101620.59718-2-mluis.reis@gmail.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Check whether user has explicitly defined device and partition where environment file will be located before using 'auto' i.e. bootable partition Voids the need to set such partition as bootable to work with the 'dev:auto' tuple Signed-off-by: Manuel Reis Cc: Patrick Delaunay Cc: Patrice Chotard Tested-by: Michael Opdenacker --- board/st/stm32mp1/stm32mp1.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/board/st/stm32mp1/stm32mp1.c b/board/st/stm32mp1/stm32mp1.c index 03a19af930..09d9bbf07d 100644 --- a/board/st/stm32mp1/stm32mp1.c +++ b/board/st/stm32mp1/stm32mp1.c @@ -827,7 +827,12 @@ const char *env_ext4_get_intf(void) const char *env_ext4_get_dev_part(void) { + static char *const env_dev_part = CONFIG_ENV_EXT4_DEVICE_AND_PART; static char *const dev_part[] = {"0:auto", "1:auto", "2:auto"}; + + if (strlen(env_dev_part) > 0) + return env_dev_part; + u32 bootmode = get_bootmode(); return dev_part[(bootmode & TAMP_BOOT_INSTANCE_MASK) - 1]; -- 2.27.0