ubi.c (0649cd0d4908d9b983a0361b8665938ef25701be) ubi.c (203e94f6c9ca03e260175ce240f5856507395585)
1/*
2 * (c) Copyright 2012 by National Instruments,
3 * Joe Hershberger <joe.hershberger@ni.com>
4 *
5 * SPDX-License-Identifier: GPL-2.0+
6 */
7
8#include <common.h>

--- 12 unchanged lines hidden (view full) ---

21env_t *env_ptr;
22
23DECLARE_GLOBAL_DATA_PTR;
24
25int env_init(void)
26{
27 /* use default */
28 gd->env_addr = (ulong)&default_environment[0];
1/*
2 * (c) Copyright 2012 by National Instruments,
3 * Joe Hershberger <joe.hershberger@ni.com>
4 *
5 * SPDX-License-Identifier: GPL-2.0+
6 */
7
8#include <common.h>

--- 12 unchanged lines hidden (view full) ---

21env_t *env_ptr;
22
23DECLARE_GLOBAL_DATA_PTR;
24
25int env_init(void)
26{
27 /* use default */
28 gd->env_addr = (ulong)&default_environment[0];
29 gd->env_valid = 1;
29 gd->env_valid = ENV_VALID;
30
31 return 0;
32}
33
34#ifdef CONFIG_CMD_SAVEENV
35#ifdef CONFIG_SYS_REDUNDAND_ENVIRONMENT
36int saveenv(void)
37{

--- 5 unchanged lines hidden (view full) ---

43 return ret;
44
45 if (ubi_part(CONFIG_ENV_UBI_PART, NULL)) {
46 printf("\n** Cannot find mtd partition \"%s\"\n",
47 CONFIG_ENV_UBI_PART);
48 return 1;
49 }
50
30
31 return 0;
32}
33
34#ifdef CONFIG_CMD_SAVEENV
35#ifdef CONFIG_SYS_REDUNDAND_ENVIRONMENT
36int saveenv(void)
37{

--- 5 unchanged lines hidden (view full) ---

43 return ret;
44
45 if (ubi_part(CONFIG_ENV_UBI_PART, NULL)) {
46 printf("\n** Cannot find mtd partition \"%s\"\n",
47 CONFIG_ENV_UBI_PART);
48 return 1;
49 }
50
51 if (gd->env_valid == 1) {
51 if (gd->env_valid == ENV_VALID) {
52 puts("Writing to redundant UBI... ");
53 if (ubi_volume_write(CONFIG_ENV_UBI_VOLUME_REDUND,
54 (void *)env_new, CONFIG_ENV_SIZE)) {
55 printf("\n** Unable to write env to %s:%s **\n",
56 CONFIG_ENV_UBI_PART,
57 CONFIG_ENV_UBI_VOLUME_REDUND);
58 return 1;
59 }

--- 5 unchanged lines hidden (view full) ---

65 CONFIG_ENV_UBI_PART,
66 CONFIG_ENV_UBI_VOLUME);
67 return 1;
68 }
69 }
70
71 puts("done\n");
72
52 puts("Writing to redundant UBI... ");
53 if (ubi_volume_write(CONFIG_ENV_UBI_VOLUME_REDUND,
54 (void *)env_new, CONFIG_ENV_SIZE)) {
55 printf("\n** Unable to write env to %s:%s **\n",
56 CONFIG_ENV_UBI_PART,
57 CONFIG_ENV_UBI_VOLUME_REDUND);
58 return 1;
59 }

--- 5 unchanged lines hidden (view full) ---

65 CONFIG_ENV_UBI_PART,
66 CONFIG_ENV_UBI_VOLUME);
67 return 1;
68 }
69 }
70
71 puts("done\n");
72
73 gd->env_valid = gd->env_valid == 2 ? 1 : 2;
73 gd->env_valid = gd->env_valid == ENV_REDUND ? ENV_VALID : ENV_REDUND;
74
75 return 0;
76}
77#else /* ! CONFIG_SYS_REDUNDAND_ENVIRONMENT */
78int saveenv(void)
79{
80 ALLOC_CACHE_ALIGN_BUFFER(env_t, env_new, 1);
81 int ret;

--- 98 unchanged lines hidden --- 		74
75 return 0;
76}
77#else /* ! CONFIG_SYS_REDUNDAND_ENVIRONMENT */
78int saveenv(void)
79{
80 ALLOC_CACHE_ALIGN_BUFFER(env_t, env_new, 1);
81 int ret;

--- 98 unchanged lines hidden ---