|
@@ -342,7 +342,8 @@ U_BOOT_CMD(
|
|
|
|
|
|
#if defined(CONFIG_PRAM)
|
|
|
#include <environment.h>
|
|
|
-extern env_t *env_ptr;
|
|
|
+#include <search.h>
|
|
|
+#include <errno.h>
|
|
|
|
|
|
int do_painit(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
|
|
|
{
|
|
@@ -351,6 +352,10 @@ int do_painit(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
|
|
|
u32 param;
|
|
|
ulong *lptr;
|
|
|
|
|
|
+ env_t *envp;
|
|
|
+ char *res;
|
|
|
+ int len;
|
|
|
+
|
|
|
v = getenv("pram");
|
|
|
if (v)
|
|
|
pram = simple_strtoul(v, NULL, 10);
|
|
@@ -384,7 +389,15 @@ int do_painit(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
|
|
|
|
|
|
/* env is first (4k aligned) */
|
|
|
nextbase -= ((CONFIG_ENV_SIZE + 4096 - 1) & ~(4096 - 1));
|
|
|
- memcpy((void*)nextbase, env_ptr, CONFIG_ENV_SIZE);
|
|
|
+ envp = (env_t *)nextbase;
|
|
|
+ res = (char *)envp->data;
|
|
|
+ len = hexport_r(&env_htab, '\0', &res, ENV_SIZE, 0, NULL);
|
|
|
+ if (len < 0) {
|
|
|
+ error("Cannot export environment: errno = %d\n", errno);
|
|
|
+ return 1;
|
|
|
+ }
|
|
|
+ envp->crc = crc32(0, envp->data, ENV_SIZE);
|
|
|
+
|
|
|
*(--lptr) = CONFIG_ENV_SIZE; /* size */
|
|
|
*(--lptr) = base - nextbase; /* offset | type=0 */
|
|
|
|