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: correctly render MAC address device path nodes
[oweals/u-boot.git]
/
env
/
fat.c
diff --git
a/env/fat.c
b/env/fat.c
index b959013a88feb20feefffc11e1050a706f72bbb2..1836556f361d012e0bcd5ba54323475fe181e8a3 100644
(file)
--- a/
env/fat.c
+++ b/
env/fat.c
@@
-1,16
+1,16
@@
+// 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 <command.h>
*/
#include <common.h>
#include <command.h>
-#include <environment.h>
+#include <env.h>
+#include <env_internal.h>
#include <linux/stddef.h>
#include <malloc.h>
#include <memalign.h>
#include <linux/stddef.h>
#include <malloc.h>
#include <memalign.h>
@@
-31,25
+31,10
@@
# endif
#endif
# endif
#endif
-char *env_name_spec = "FAT";
-
-env_t *env_ptr;
-
-DECLARE_GLOBAL_DATA_PTR;
-
-static int env_fat_init(void)
-{
- /* use default */
- gd->env_addr = (ulong)&default_environment[0];
- gd->env_valid = ENV_VALID;
-
- return 0;
-}
-
#ifdef CMD_SAVEENV
static int env_fat_save(void)
{
#ifdef CMD_SAVEENV
static int env_fat_save(void)
{
- env_t
env_new;
+ env_t
__aligned(ARCH_DMA_MINALIGN)
env_new;
struct blk_desc *dev_desc = NULL;
disk_partition_t info;
int dev, part;
struct blk_desc *dev_desc = NULL;
disk_partition_t info;
int dev, part;
@@
-68,7
+53,11
@@
static int env_fat_save(void)
dev = dev_desc->devnum;
if (fat_set_blk_dev(dev_desc, &info) != 0) {
dev = dev_desc->devnum;
if (fat_set_blk_dev(dev_desc, &info) != 0) {
- printf("\n** Unable to use %s %d:%d for saveenv **\n",
+ /*
+ * This printf is embedded in the messages from env_save that
+ * will calling it. The missing \n is intentional.
+ */
+ printf("Unable to use %s %d:%d... ",
CONFIG_ENV_FAT_INTERFACE, dev, part);
return 1;
}
CONFIG_ENV_FAT_INTERFACE, dev, part);
return 1;
}
@@
-76,18
+65,21
@@
static int env_fat_save(void)
err = file_fat_write(CONFIG_ENV_FAT_FILE, (void *)&env_new, 0, sizeof(env_t),
&size);
if (err == -1) {
err = file_fat_write(CONFIG_ENV_FAT_FILE, (void *)&env_new, 0, sizeof(env_t),
&size);
if (err == -1) {
- printf("\n** Unable to write \"%s\" from %s%d:%d **\n",
+ /*
+ * This printf is embedded in the messages from env_save that
+ * will calling it. The missing \n is intentional.
+ */
+ printf("Unable to write \"%s\" from %s%d:%d... ",
CONFIG_ENV_FAT_FILE, CONFIG_ENV_FAT_INTERFACE, dev, part);
return 1;
}
CONFIG_ENV_FAT_FILE, CONFIG_ENV_FAT_INTERFACE, dev, part);
return 1;
}
- puts("done\n");
return 0;
}
#endif /* CMD_SAVEENV */
#ifdef LOADENV
return 0;
}
#endif /* CMD_SAVEENV */
#ifdef LOADENV
-static
void
env_fat_load(void)
+static
int
env_fat_load(void)
{
ALLOC_CACHE_ALIGN_BUFFER(char, buf, CONFIG_ENV_SIZE);
struct blk_desc *dev_desc = NULL;
{
ALLOC_CACHE_ALIGN_BUFFER(char, buf, CONFIG_ENV_SIZE);
struct blk_desc *dev_desc = NULL;
@@
-95,6
+87,11
@@
static void 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);
+#endif
+
part = blk_get_device_part_str(CONFIG_ENV_FAT_INTERFACE,
CONFIG_ENV_FAT_DEVICE_AND_PART,
&dev_desc, &info, 1);
part = blk_get_device_part_str(CONFIG_ENV_FAT_INTERFACE,
CONFIG_ENV_FAT_DEVICE_AND_PART,
&dev_desc, &info, 1);
@@
-103,33
+100,42
@@
static void env_fat_load(void)
dev = dev_desc->devnum;
if (fat_set_blk_dev(dev_desc, &info) != 0) {
dev = dev_desc->devnum;
if (fat_set_blk_dev(dev_desc, &info) != 0) {
- printf("\n** Unable to use %s %d:%d for loading the env **\n",
+ /*
+ * This printf is embedded in the messages from env_save that
+ * will calling it. The missing \n is intentional.
+ */
+ printf("Unable to use %s %d:%d... ",
CONFIG_ENV_FAT_INTERFACE, dev, part);
goto err_env_relocate;
}
err = file_fat_read(CONFIG_ENV_FAT_FILE, buf, CONFIG_ENV_SIZE);
if (err == -1) {
CONFIG_ENV_FAT_INTERFACE, dev, part);
goto err_env_relocate;
}
err = file_fat_read(CONFIG_ENV_FAT_FILE, buf, CONFIG_ENV_SIZE);
if (err == -1) {
- printf("\n** Unable to read \"%s\" from %s%d:%d **\n",
+ /*
+ * This printf is embedded in the messages from env_save that
+ * will calling it. The missing \n is intentional.
+ */
+ printf("Unable to read \"%s\" from %s%d:%d... ",
CONFIG_ENV_FAT_FILE, CONFIG_ENV_FAT_INTERFACE, dev, part);
goto err_env_relocate;
}
CONFIG_ENV_FAT_FILE, CONFIG_ENV_FAT_INTERFACE, dev, part);
goto err_env_relocate;
}
- env_import(buf, 1);
- return;
+ return env_import(buf, 1);
err_env_relocate:
err_env_relocate:
- set_default_env(NULL);
+ env_set_default(NULL, 0);
+
+ return -EIO;
}
#endif /* LOADENV */
U_BOOT_ENV_LOCATION(fat) = {
.location = ENVL_FAT,
}
#endif /* LOADENV */
U_BOOT_ENV_LOCATION(fat) = {
.location = ENVL_FAT,
+ ENV_NAME("FAT")
#ifdef LOADENV
.load = env_fat_load,
#endif
#ifdef CMD_SAVEENV
.save = env_save_ptr(env_fat_save),
#endif
#ifdef LOADENV
.load = env_fat_load,
#endif
#ifdef CMD_SAVEENV
.save = env_save_ptr(env_fat_save),
#endif
- .init = env_fat_init,
};
};