projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
efi_loader: consistent types in efidebug.c
[oweals/u-boot.git]
/
env
/
fat.c
diff --git
a/env/fat.c
b/env/fat.c
index 19f260e881ac3e77f5d04e69aeb261691f780388..7f74c64dfe7e094af8142cb66dc94682dabc6b5a 100644
(file)
--- a/
env/fat.c
+++ b/
env/fat.c
@@
-1,10
+1,9
@@
+// SPDX-License-Identifier: GPL-2.0+
/*
* (c) Copyright 2011 by Tigris Elektronik GmbH
*
* Author:
* Maximilian Schwerin <mvs@tigris.de>
/*
* (c) Copyright 2011 by Tigris Elektronik GmbH
*
* Author:
* Maximilian Schwerin <mvs@tigris.de>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#include <common.h>
*/
#include <common.h>
@@
-31,8
+30,6
@@
# endif
#endif
# endif
#endif
-DECLARE_GLOBAL_DATA_PTR;
-
#ifdef CMD_SAVEENV
static int env_fat_save(void)
{
#ifdef CMD_SAVEENV
static int env_fat_save(void)
{
@@
-89,8
+86,10
@@
static int env_fat_load(void)
int dev, part;
int err;
int dev, part;
int err;
+#ifdef CONFIG_MMC
if (!strcmp(CONFIG_ENV_FAT_INTERFACE, "mmc"))
mmc_initialize(NULL);
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,
part = blk_get_device_part_str(CONFIG_ENV_FAT_INTERFACE,
CONFIG_ENV_FAT_DEVICE_AND_PART,
@@
-123,7
+122,7
@@
static int env_fat_load(void)
return env_import(buf, 1);
err_env_relocate:
return env_import(buf, 1);
err_env_relocate:
- set_default_env(NULL);
+ set_default_env(NULL
, 0
);
return -EIO;
}
return -EIO;
}