diff mbox series

[U-Boot,1/1] env: mmc/fat/ext4: undefined reference to `mmc_initialize'

Message ID 20180414134100.10162-1-xypron.glpk@gmx.de
State Accepted
Commit 95058fbb97b8846e5fa569d5083a76567f2b9d81
Delegated to: Tom Rini
Headers show
Series [U-Boot,1/1] env: mmc/fat/ext4: undefined reference to `mmc_initialize' | expand

Commit Message

Heinrich Schuchardt April 14, 2018, 1:41 p.m. UTC
For CONFIG_ENV_FAT_INTERFACE != 'mmc' a link error
env/fat.c:93: undefined reference to `mmc_initialize'
occurs if CONFIG_MMC_SUPPORT is not enabled.

Fixes: 26862b4a40c3 ("env: mmc/fat/ext4: make sure that the MMC sub-system
is initialized before using it")
Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
---
 env/ext4.c | 2 ++
 env/fat.c  | 2 ++
 2 files changed, 4 insertions(+)

Comments

Tom Rini April 17, 2018, 1:23 a.m. UTC | #1
On Sat, Apr 14, 2018 at 03:41:00PM +0200, Heinrich Schuchardt wrote:

> For CONFIG_ENV_FAT_INTERFACE != 'mmc' a link error
> env/fat.c:93: undefined reference to `mmc_initialize'
> occurs if CONFIG_MMC_SUPPORT is not enabled.
> 
> Fixes: 26862b4a40c3 ("env: mmc/fat/ext4: make sure that the MMC sub-system
> is initialized before using it")
> Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>

Applied to u-boot/master, thanks!
Simon Glass April 17, 2018, 3:10 p.m. UTC | #2
On 14 April 2018 at 07:41, Heinrich Schuchardt <xypron.glpk@gmx.de> wrote:
> For CONFIG_ENV_FAT_INTERFACE != 'mmc' a link error
> env/fat.c:93: undefined reference to `mmc_initialize'
> occurs if CONFIG_MMC_SUPPORT is not enabled.
>
> Fixes: 26862b4a40c3 ("env: mmc/fat/ext4: make sure that the MMC sub-system
> is initialized before using it")
> Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
> ---
>  env/ext4.c | 2 ++
>  env/fat.c  | 2 ++
>  2 files changed, 4 insertions(+)

Reviewed-by: Simon Glass <sjg@chromium.org>
diff mbox series

Patch

diff --git a/env/ext4.c b/env/ext4.c
index 6c69a0a57f..a2d32b9c8d 100644
--- a/env/ext4.c
+++ b/env/ext4.c
@@ -87,8 +87,10 @@  static int env_ext4_load(void)
 	int err;
 	loff_t off;
 
+#ifdef CONFIG_MMC
 	if (!strcmp(CONFIG_ENV_EXT4_INTERFACE, "mmc"))
 		mmc_initialize(NULL);
+#endif
 
 	part = blk_get_device_part_str(CONFIG_ENV_EXT4_INTERFACE,
 				       CONFIG_ENV_EXT4_DEVICE_AND_PART,
diff --git a/env/fat.c b/env/fat.c
index 19f260e881..884eeb8c5f 100644
--- a/env/fat.c
+++ b/env/fat.c
@@ -89,8 +89,10 @@  static int env_fat_load(void)
 	int dev, part;
 	int err;
 
+#ifdef CONFIG_MMC
 	if (!strcmp(CONFIG_ENV_FAT_INTERFACE, "mmc"))
 		mmc_initialize(NULL);
+#endif
 
 	part = blk_get_device_part_str(CONFIG_ENV_FAT_INTERFACE,
 					CONFIG_ENV_FAT_DEVICE_AND_PART,