Skip to contentSkip to conversation

env_eeprom: Assign default environment during board_init_f

PATCH New Siva Durga Prasad Paladugu 3 participants 3 messages May 26, 2014 – Jun 5, 2014

lore
Share & tools
lore

Siva Durga Prasad Paladugu

author
#0 lore raw

PATCH v2 1/1 env_eeprom: Assign default environment during board_init_f

Assign default environment and set env valid during board_init_f before relocation as the actual environment will be read from eeprom later.

Signed-off-by Siva Durga Prasad Paladugu <[email protected]>

---

Changes in v2:
-Handled the same in redundant env case also
as per review comment.

 common/env_eeprom.c |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)
common/env_eeprom.c +10 -2
index 490ac73..905d39a 100644
@@ -147,6 +147,7 @@ int saveenv(void)
 #ifdef CONFIG_ENV_OFFSET_REDUND
 int env_init(void)
 {
+#ifdef ENV_IS_EMBEDDED
 	ulong len, crc[2], crc_tmp;
 	unsigned int off, off_env[2];
 	uchar buf[64], flags[2];

@@ -212,12 +213,16 @@ int env_init(void)
 		gd->env_addr = off_env[1] + offsetof(env_t, data);
 	else if (gd->env_valid == 1)
 		gd->env_addr = off_env[0] + offsetof(env_t, data);
-
+#else
+	gd->env_addr = (ulong)&default_environment[0];
+	gd->env_valid = 1;
+#endif
 	return 0;
 }
 #else
 int env_init(void)
 {
+#ifdef ENV_IS_EMBEDDED
 	ulong crc, len, new;
 	unsigned off;
 	uchar buf[64];

@@ -250,7 +255,10 @@ int env_init(void)
 		gd->env_addr	= 0;
 		gd->env_valid	= 0;
 	}
-
+#else
+	gd->env_addr = (ulong)&default_environment[0];
+	gd->env_valid = 1;
+#endif
 	return 0;
 }
 #endif
Signature · 1 line
1.7.4
#1 lore raw

PATCH v2 1/1 env_eeprom: Assign default environment during board_init_f

Quoted 46 lines · Siva Durga Prasad Paladugu

Assign default environment and set env valid during board_init_f before relocation as the actual environment will be read from eeprom later.

Signed-off-by Siva Durga Prasad Paladugu <[email protected]>

---

Changes in v2:
-Handled the same in redundant env case also
as per review comment.

 common/env_eeprom.c |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)
common/env_eeprom.c +6 -1
index 490ac73..905d39a 100644
@@ -147,6 +147,7 @@ int saveenv(void)
 #ifdef CONFIG_ENV_OFFSET_REDUND
 int env_init(void)
 {
+#ifdef ENV_IS_EMBEDDED
 	ulong len, crc[2], crc_tmp;
 	unsigned int off, off_env[2];
 	uchar buf[64], flags[2];

@@ -212,12 +213,16 @@ int env_init(void)
 		gd->env_addr = off_env[1] + offsetof(env_t, data);
 	else if (gd->env_valid == 1)
 		gd->env_addr = off_env[0] + offsetof(env_t, data);
-
+#else
+	gd->env_addr = (ulong)&default_environment[0];
+	gd->env_valid = 1;
+#endif
 	return 0;
 }
 #else
 int env_init(void)
 {
+#ifdef ENV_IS_EMBEDDED
 	ulong crc, len, new;
 	unsigned off;
 	uchar buf[64];

@@ -250,7 +255,10 @@ int env_init(void)
 		gd->env_addr	= 0;

common/env_eeprom.c int env_init(void) · line 264

Quoted 10 lines
common/env_eeprom.c +4 -1
 		gd->env_valid	= 0;
 	}
-
+#else
+	gd->env_addr = (ulong)&default_environment[0];
+	gd->env_valid = 1;
+#endif
 	return 0;
 }
 #endif
Acked-by Michal Simek <[email protected]>

Thanks,
Michal

Signature · 14 lines
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Microblaze cpu - http://www.monstr.eu/fdt/
Maintainer of Linux kernel - Xilinx Zynq ARM architecture
Microblaze U-BOOT custodian and responsible for u-boot arm zynq platform


-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 263 bytes
Desc: OpenPGP digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140528/67f56495/attachment.pgp>
#2 lore raw

PATCH v2 1/1 env_eeprom: Assign default environment during board_init_f

In reply to Siva Durga Prasad Paladugu
Quoted 6 lines · Siva Durga Prasad Paladugu

Assign default environment and set env valid during board_init_f before relocation as the actual environment will be read from eeprom later.

Signed-off-by Siva Durga Prasad Paladugu <[email protected]>
Acked-by Michal Simek <[email protected]>

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140605/b998afa8/attachment.pgp>