mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-12-02 01:19:49 +00:00
60f7da1f42
commit ea882baf9c introduces
a command_sub_table for the "env" command. On arm, avr32, m68k,
mips and sparc architectures, relocation needs manual fixups,
so add these fixups for this sub command table too.
Tested on arm/qong board.
mips board (Ben NanoNote) from Xiangfu Liu
arm/AT91 board from Reinhard Meyer
Signed-off-by: Heiko Schocher <hs@denx.de>
cc: Wolfgang Denk <wd@denx.de>
cc: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>
cc: Xiangfu Liu <xiangfu@openmobilefree.net>
cc: Reinhard Meyer <u-boot@emk-elektronik.de>
cc: sshtylyov@mvista.com
286 lines
6.4 KiB
C
286 lines
6.4 KiB
C
/*
|
|
* (C) Copyright 2000-2010
|
|
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
|
|
*
|
|
* (C) Copyright 2001 Sysgo Real-Time Solutions, GmbH <www.elinos.com>
|
|
* Andreas Heppel <aheppel@sysgo.de>
|
|
*
|
|
* See file CREDITS for list of people who contributed to this
|
|
* project.
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License as
|
|
* published by the Free Software Foundation; either version 2 of
|
|
* the License, or (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
|
|
* MA 02111-1307 USA
|
|
*/
|
|
|
|
#include <common.h>
|
|
#include <command.h>
|
|
#include <environment.h>
|
|
#include <linux/stddef.h>
|
|
#include <search.h>
|
|
#include <errno.h>
|
|
#include <malloc.h>
|
|
|
|
DECLARE_GLOBAL_DATA_PTR;
|
|
|
|
extern env_t *env_ptr;
|
|
|
|
extern void env_relocate_spec (void);
|
|
extern uchar env_get_char_spec(int);
|
|
|
|
static uchar env_get_char_init (int index);
|
|
|
|
/************************************************************************
|
|
* Default settings to be used when no valid environment is found
|
|
*/
|
|
#define XMK_STR(x) #x
|
|
#define MK_STR(x) XMK_STR(x)
|
|
|
|
uchar default_environment[] = {
|
|
#ifdef CONFIG_BOOTARGS
|
|
"bootargs=" CONFIG_BOOTARGS "\0"
|
|
#endif
|
|
#ifdef CONFIG_BOOTCOMMAND
|
|
"bootcmd=" CONFIG_BOOTCOMMAND "\0"
|
|
#endif
|
|
#ifdef CONFIG_RAMBOOTCOMMAND
|
|
"ramboot=" CONFIG_RAMBOOTCOMMAND "\0"
|
|
#endif
|
|
#ifdef CONFIG_NFSBOOTCOMMAND
|
|
"nfsboot=" CONFIG_NFSBOOTCOMMAND "\0"
|
|
#endif
|
|
#if defined(CONFIG_BOOTDELAY) && (CONFIG_BOOTDELAY >= 0)
|
|
"bootdelay=" MK_STR(CONFIG_BOOTDELAY) "\0"
|
|
#endif
|
|
#if defined(CONFIG_BAUDRATE) && (CONFIG_BAUDRATE >= 0)
|
|
"baudrate=" MK_STR(CONFIG_BAUDRATE) "\0"
|
|
#endif
|
|
#ifdef CONFIG_LOADS_ECHO
|
|
"loads_echo=" MK_STR(CONFIG_LOADS_ECHO) "\0"
|
|
#endif
|
|
#ifdef CONFIG_ETHADDR
|
|
"ethaddr=" MK_STR(CONFIG_ETHADDR) "\0"
|
|
#endif
|
|
#ifdef CONFIG_ETH1ADDR
|
|
"eth1addr=" MK_STR(CONFIG_ETH1ADDR) "\0"
|
|
#endif
|
|
#ifdef CONFIG_ETH2ADDR
|
|
"eth2addr=" MK_STR(CONFIG_ETH2ADDR) "\0"
|
|
#endif
|
|
#ifdef CONFIG_ETH3ADDR
|
|
"eth3addr=" MK_STR(CONFIG_ETH3ADDR) "\0"
|
|
#endif
|
|
#ifdef CONFIG_ETH4ADDR
|
|
"eth4addr=" MK_STR(CONFIG_ETH4ADDR) "\0"
|
|
#endif
|
|
#ifdef CONFIG_ETH5ADDR
|
|
"eth5addr=" MK_STR(CONFIG_ETH5ADDR) "\0"
|
|
#endif
|
|
#ifdef CONFIG_IPADDR
|
|
"ipaddr=" MK_STR(CONFIG_IPADDR) "\0"
|
|
#endif
|
|
#ifdef CONFIG_SERVERIP
|
|
"serverip=" MK_STR(CONFIG_SERVERIP) "\0"
|
|
#endif
|
|
#ifdef CONFIG_SYS_AUTOLOAD
|
|
"autoload=" CONFIG_SYS_AUTOLOAD "\0"
|
|
#endif
|
|
#ifdef CONFIG_PREBOOT
|
|
"preboot=" CONFIG_PREBOOT "\0"
|
|
#endif
|
|
#ifdef CONFIG_ROOTPATH
|
|
"rootpath=" MK_STR(CONFIG_ROOTPATH) "\0"
|
|
#endif
|
|
#ifdef CONFIG_GATEWAYIP
|
|
"gatewayip=" MK_STR(CONFIG_GATEWAYIP) "\0"
|
|
#endif
|
|
#ifdef CONFIG_NETMASK
|
|
"netmask=" MK_STR(CONFIG_NETMASK) "\0"
|
|
#endif
|
|
#ifdef CONFIG_HOSTNAME
|
|
"hostname=" MK_STR(CONFIG_HOSTNAME) "\0"
|
|
#endif
|
|
#ifdef CONFIG_BOOTFILE
|
|
"bootfile=" MK_STR(CONFIG_BOOTFILE) "\0"
|
|
#endif
|
|
#ifdef CONFIG_LOADADDR
|
|
"loadaddr=" MK_STR(CONFIG_LOADADDR) "\0"
|
|
#endif
|
|
#ifdef CONFIG_CLOCKS_IN_MHZ
|
|
"clocks_in_mhz=1\0"
|
|
#endif
|
|
#if defined(CONFIG_PCI_BOOTDELAY) && (CONFIG_PCI_BOOTDELAY > 0)
|
|
"pcidelay=" MK_STR(CONFIG_PCI_BOOTDELAY) "\0"
|
|
#endif
|
|
#ifdef CONFIG_EXTRA_ENV_SETTINGS
|
|
CONFIG_EXTRA_ENV_SETTINGS
|
|
#endif
|
|
"\0"
|
|
};
|
|
|
|
static uchar env_get_char_init (int index)
|
|
{
|
|
uchar c;
|
|
|
|
/* if crc was bad, use the default environment */
|
|
if (gd->env_valid)
|
|
c = env_get_char_spec(index);
|
|
else
|
|
c = default_environment[index];
|
|
|
|
return (c);
|
|
}
|
|
|
|
uchar env_get_char_memory (int index)
|
|
{
|
|
return *env_get_addr(index);
|
|
}
|
|
|
|
uchar env_get_char (int index)
|
|
{
|
|
uchar c;
|
|
|
|
/* if relocated to RAM */
|
|
if (gd->flags & GD_FLG_RELOC)
|
|
c = env_get_char_memory(index);
|
|
else
|
|
c = env_get_char_init(index);
|
|
|
|
return (c);
|
|
}
|
|
|
|
uchar *env_get_addr (int index)
|
|
{
|
|
if (gd->env_valid)
|
|
return (uchar *)(gd->env_addr + index);
|
|
else
|
|
return &default_environment[index];
|
|
}
|
|
|
|
void set_default_env(const char *s)
|
|
{
|
|
if (sizeof(default_environment) > ENV_SIZE) {
|
|
puts("*** Error - default environment is too large\n\n");
|
|
return;
|
|
}
|
|
|
|
if (s) {
|
|
if (*s == '!') {
|
|
printf("*** Warning - %s, "
|
|
"using default environment\n\n",
|
|
s+1);
|
|
} else {
|
|
puts(s);
|
|
}
|
|
} else {
|
|
puts("Using default environment\n\n");
|
|
}
|
|
|
|
if (himport((char *)default_environment,
|
|
sizeof(default_environment), '\0', 0) == 0) {
|
|
error("Environment import failed: errno = %d\n", errno);
|
|
}
|
|
gd->flags |= GD_FLG_ENV_READY;
|
|
}
|
|
|
|
/*
|
|
* Check if CRC is valid and (if yes) import the environment.
|
|
* Note that "buf" may or may not be aligned.
|
|
*/
|
|
int env_import(const char *buf, int check)
|
|
{
|
|
env_t *ep = (env_t *)buf;
|
|
|
|
if (check) {
|
|
uint32_t crc;
|
|
|
|
memcpy(&crc, &ep->crc, sizeof(crc));
|
|
|
|
if (crc32(0, ep->data, ENV_SIZE) != crc) {
|
|
set_default_env("!bad CRC");
|
|
return 0;
|
|
}
|
|
}
|
|
|
|
if (himport((char *)ep->data, ENV_SIZE, '\0', 0)) {
|
|
gd->flags |= GD_FLG_ENV_READY;
|
|
return 1;
|
|
}
|
|
|
|
error("Cannot import environment: errno = %d\n", errno);
|
|
|
|
set_default_env("!import failed");
|
|
|
|
return 0;
|
|
}
|
|
|
|
void env_relocate (void)
|
|
{
|
|
#if !defined(CONFIG_RELOC_FIXUP_WORKS)
|
|
extern void env_reloc(void);
|
|
|
|
env_reloc();
|
|
#endif
|
|
if (gd->env_valid == 0) {
|
|
#if defined(CONFIG_ENV_IS_NOWHERE) /* Environment not changable */
|
|
set_default_env(NULL);
|
|
#else
|
|
show_boot_progress (-60);
|
|
#endif
|
|
set_default_env("!bad CRC");
|
|
} else {
|
|
env_relocate_spec ();
|
|
}
|
|
}
|
|
|
|
#if 0 /* need to reimplement - def CONFIG_AUTO_COMPLETE */
|
|
int env_complete(char *var, int maxv, char *cmdv[], int bufsz, char *buf)
|
|
{
|
|
int i, nxt, len, vallen, found;
|
|
const char *lval, *rval;
|
|
|
|
found = 0;
|
|
cmdv[0] = NULL;
|
|
|
|
len = strlen(var);
|
|
/* now iterate over the variables and select those that match */
|
|
for (i=0; env_get_char(i) != '\0'; i=nxt+1) {
|
|
|
|
for (nxt=i; env_get_char(nxt) != '\0'; ++nxt)
|
|
;
|
|
|
|
lval = (char *)env_get_addr(i);
|
|
rval = strchr(lval, '=');
|
|
if (rval != NULL) {
|
|
vallen = rval - lval;
|
|
rval++;
|
|
} else
|
|
vallen = strlen(lval);
|
|
|
|
if (len > 0 && (vallen < len || memcmp(lval, var, len) != 0))
|
|
continue;
|
|
|
|
if (found >= maxv - 2 || bufsz < vallen + 1) {
|
|
cmdv[found++] = "...";
|
|
break;
|
|
}
|
|
cmdv[found++] = buf;
|
|
memcpy(buf, lval, vallen); buf += vallen; bufsz -= vallen;
|
|
*buf++ = '\0'; bufsz--;
|
|
}
|
|
|
|
cmdv[found] = NULL;
|
|
return found;
|
|
}
|
|
#endif
|