X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;ds=sidebyside;f=common%2Fenv_nand.c;h=92e0e053dfe6b57abe49156bc246e780089a4af0;hb=ecfb8768b16ebf6781ee0df45742674bda8a9543;hp=9c9bb82c0faf81f3d6d6295f99ecfcfd3a1cea2b;hpb=878cd63e02f63f245182a101807186b44e20f116;p=oweals%2Fu-boot.git

diff --git a/common/env_nand.c b/common/env_nand.c
index 9c9bb82c0f..92e0e053df 100644
--- a/common/env_nand.c
+++ b/common/env_nand.c
@@ -233,6 +233,12 @@ int saveenv(void)
 }
 #endif /* CMD_SAVEENV */
 
+#if defined(CONFIG_SPL_BUILD)
+static int readenv(size_t offset, u_char *buf)
+{
+	return nand_spl_load_image(offset, CONFIG_ENV_SIZE, buf);
+}
+#else
 static int readenv(size_t offset, u_char *buf)
 {
 	size_t end = offset + CONFIG_ENV_RANGE;
@@ -266,6 +272,7 @@ static int readenv(size_t offset, u_char *buf)
 
 	return 0;
 }
+#endif /* #if defined(CONFIG_SPL_BUILD) */
 
 #ifdef CONFIG_ENV_OFFSET_OOB
 int get_nand_env_oob(nand_info_t *nand, unsigned long *result)