mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-30 00:21:06 +00:00
be354c1a21
Use get_device_and_partition() is better since:
1. It will call the device initialize function internally. So we can
remove the mmc intialization code to save many lines.
2. It is used by fatls/fatload/fatwrite. So saveenv & load env should
use it too.
3. It can parse the "D:P", "D", "D:", "D:auto" string to get correct
device and partition information by run-time.
Also we remove the FAT_ENV_DEVICE and FAT_ENV_PART. We use a string:
FAT_ENV_DEVICE_AND_PART.
For at91sam9m10g45ek, it is "0". That means use device 0 and if:
a)device 0 has no partition table, use the whole device as a FAT file
system.
b)device 0 has partittion table, use the partition #1.
Refer to the commit: 10a37fd7a4
for details of device & partition string.
Signed-off-by: Josh Wu <josh.wu@atmel.com>
Reviewed-by: Stephen Warren <swarren@nvidia.com>
107 lines
2.1 KiB
C
107 lines
2.1 KiB
C
/*
|
|
* (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 <environment.h>
|
|
#include <linux/stddef.h>
|
|
#include <malloc.h>
|
|
#include <search.h>
|
|
#include <errno.h>
|
|
#include <fat.h>
|
|
#include <mmc.h>
|
|
|
|
char *env_name_spec = "FAT";
|
|
|
|
env_t *env_ptr;
|
|
|
|
DECLARE_GLOBAL_DATA_PTR;
|
|
|
|
int env_init(void)
|
|
{
|
|
/* use default */
|
|
gd->env_addr = (ulong)&default_environment[0];
|
|
gd->env_valid = 1;
|
|
|
|
return 0;
|
|
}
|
|
|
|
#ifdef CONFIG_CMD_SAVEENV
|
|
int saveenv(void)
|
|
{
|
|
env_t env_new;
|
|
block_dev_desc_t *dev_desc = NULL;
|
|
disk_partition_t info;
|
|
int dev, part;
|
|
int err;
|
|
|
|
err = env_export(&env_new);
|
|
if (err)
|
|
return err;
|
|
|
|
part = get_device_and_partition(FAT_ENV_INTERFACE,
|
|
FAT_ENV_DEVICE_AND_PART,
|
|
&dev_desc, &info, 1);
|
|
if (part < 0)
|
|
return 1;
|
|
|
|
dev = dev_desc->dev;
|
|
if (fat_set_blk_dev(dev_desc, &info) != 0) {
|
|
printf("\n** Unable to use %s %d:%d for saveenv **\n",
|
|
FAT_ENV_INTERFACE, dev, part);
|
|
return 1;
|
|
}
|
|
|
|
err = file_fat_write(FAT_ENV_FILE, (void *)&env_new, sizeof(env_t));
|
|
if (err == -1) {
|
|
printf("\n** Unable to write \"%s\" from %s%d:%d **\n",
|
|
FAT_ENV_FILE, FAT_ENV_INTERFACE, dev, part);
|
|
return 1;
|
|
}
|
|
|
|
puts("done\n");
|
|
return 0;
|
|
}
|
|
#endif /* CONFIG_CMD_SAVEENV */
|
|
|
|
void env_relocate_spec(void)
|
|
{
|
|
char buf[CONFIG_ENV_SIZE];
|
|
block_dev_desc_t *dev_desc = NULL;
|
|
disk_partition_t info;
|
|
int dev, part;
|
|
int err;
|
|
|
|
part = get_device_and_partition(FAT_ENV_INTERFACE,
|
|
FAT_ENV_DEVICE_AND_PART,
|
|
&dev_desc, &info, 1);
|
|
if (part < 0)
|
|
goto err_env_relocate;
|
|
|
|
dev = dev_desc->dev;
|
|
if (fat_set_blk_dev(dev_desc, &info) != 0) {
|
|
printf("\n** Unable to use %s %d:%d for loading the env **\n",
|
|
FAT_ENV_INTERFACE, dev, part);
|
|
goto err_env_relocate;
|
|
}
|
|
|
|
err = file_fat_read(FAT_ENV_FILE, (uchar *)&buf, CONFIG_ENV_SIZE);
|
|
if (err == -1) {
|
|
printf("\n** Unable to read \"%s\" from %s%d:%d **\n",
|
|
FAT_ENV_FILE, FAT_ENV_INTERFACE, dev, part);
|
|
goto err_env_relocate;
|
|
}
|
|
|
|
env_import(buf, 1);
|
|
return;
|
|
|
|
err_env_relocate:
|
|
set_default_env(NULL);
|
|
}
|