[U-Boot] [PATCH] env_eeprom: Assign default environment during board_init_f

[Michal Simek]

From: Siva Durga Prasad Paladugu <siva.durga.paladugu at xilinx.com>

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 <sivadur at xilinx.com>
Signed-off-by: Michal Simek <michal.simek at xilinx.com>
---

common/env_eeprom.c | 5 +++++
1 file changed, 5 insertions(+)

diff --git a/common/env_eeprom.c b/common/env_eeprom.c
index 0db2bb6..a4020bc 100644
--- a/common/env_eeprom.c
+++ b/common/env_eeprom.c
@@ -224,6 +224,7 @@ int env_init(void)
#else
int env_init(void)
{
+#ifdef ENV_IS_EMBEDDED
ulong crc, len, new;
unsigned off;
uchar buf[64];
@@ -256,6 +257,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;
}
--
1.8.2.3

-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140425/838cb3f5/attachment.pgp>

[Michal Simek]

Hi Tom,

Post by Michal Simek
From: Siva Durga Prasad Paladugu <siva.durga.paladugu at xilinx.com>
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 <sivadur at xilinx.com>
Signed-off-by: Michal Simek <michal.simek at xilinx.com>
---
common/env_eeprom.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/common/env_eeprom.c b/common/env_eeprom.c
index 0db2bb6..a4020bc 100644
--- a/common/env_eeprom.c
+++ b/common/env_eeprom.c
@@ -224,6 +224,7 @@ int env_init(void)
#else
int env_init(void)
{
+#ifdef ENV_IS_EMBEDDED
ulong crc, len, new;
unsigned off;
uchar buf[64];
@@ -256,6 +257,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;
}
--
1.8.2.3

Any comment on this?

Thanks,
Michal
--
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: www.monstr.eu p: [phone]
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/20140506/41d3c544/attachment.pgp>

[Tom Rini]

Post by Michal Simek
From: Siva Durga Prasad Paladugu <siva.durga.paladugu at xilinx.com>
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 <sivadur at xilinx.com>
Signed-off-by: Michal Simek <michal.simek at xilinx.com>
---
common/env_eeprom.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/common/env_eeprom.c b/common/env_eeprom.c
index 0db2bb6..a4020bc 100644
--- a/common/env_eeprom.c
+++ b/common/env_eeprom.c
@@ -224,6 +224,7 @@ int env_init(void)
#else
int env_init(void)
{
+#ifdef ENV_IS_EMBEDDED
ulong crc, len, new;
unsigned off;
uchar buf[64];
@@ -256,6 +257,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;
}

Sorry for the delay. This looks fine but doesn't correct the redundant
env case which has the same problem. It would be nice if you had time
to first consolidate env_init for both cases (see how env_nand.c does
it) as well. Thanks!

[Michal Simek]

Hi Tom,

Post by Tom Rini

Post by Michal Simek
From: Siva Durga Prasad Paladugu <siva.durga.paladugu at xilinx.com>
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 <sivadur at xilinx.com>
Signed-off-by: Michal Simek <michal.simek at xilinx.com>
---
common/env_eeprom.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/common/env_eeprom.c b/common/env_eeprom.c
index 0db2bb6..a4020bc 100644
--- a/common/env_eeprom.c
+++ b/common/env_eeprom.c
@@ -224,6 +224,7 @@ int env_init(void)
#else
int env_init(void)
{
+#ifdef ENV_IS_EMBEDDED
ulong crc, len, new;
unsigned off;
uchar buf[64];
@@ -256,6 +257,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;
}

Sorry for the delay. This looks fine but doesn't correct the redundant
env case which has the same problem. It would be nice if you had time
to first consolidate env_init for both cases (see how env_nand.c does
it) as well. Thanks!

I have asked Siva to look at it but anyway if this is the right fix
it should be applied because it is fixing problem at least for one case.

Thanks,
Michal
--
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: www.monstr.eu p: [phone]
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/20140513/2cea9515/attachment.pgp>