Re: [U-Boot] [PATCH] tools/env: allow overwrite of ethaddr on default

[Andreas Bießmann]

Dear Wolfgang,

On 05.01.2012 16:59, Wolfgang Denk wrote:
 Dear Grant Erickson,
 
 In message 1324580395-27004-1-git-send-email-maratho...@gmail.com you wrote:
 This patch allows the U-Boot user space companion utility, fw_setenv,
 to overwrite the 'ethaddr' key/value pair if the current value is set
 to a per-board-configured default.

 This change allows 'fw_setenv' to match the behavior of 'setenv' /
 'env set' on the U-Boot command line.

 Signed-off-by: Grant Erickson maratho...@gmail.com
 ---
  tools/env/fw_env.c |   14 --
  1 files changed, 12 insertions(+), 2 deletions(-)
 
 Applied, thanks.

This patch breaks building 'env' without board configuration.
This is bad cause our automatic build environment build this tool for
different boards. Specific configuration is done via /etc/fw_env.config.
Can't we use some build-time configuration like
http://patchwork.ozlabs.org/patch/120372/ ?

best regards

Andreas Bießmann
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

Re: [U-Boot] [PATCH] tools/env: allow overwrite of ethaddr on default

[Mike Frysinger]

On Monday 23 January 2012 07:23:09 Andreas Bießmann wrote:
 On 05.01.2012 16:59, Wolfgang Denk wrote:
  Grant Erickson wrote:
  This patch allows the U-Boot user space companion utility, fw_setenv,
  to overwrite the 'ethaddr' key/value pair if the current value is set
  to a per-board-configured default.
  
  This change allows 'fw_setenv' to match the behavior of 'setenv' /
  'env set' on the U-Boot command line.
  
  Signed-off-by: Grant Erickson maratho...@gmail.com
  ---
  
   tools/env/fw_env.c |   14 --
   1 files changed, 12 insertions(+), 2 deletions(-)
  
  Applied, thanks.
 
 This patch breaks building 'env' without board configuration.
 This is bad cause our automatic build environment build this tool for
 different boards. Specific configuration is done via /etc/fw_env.config.
 Can't we use some build-time configuration like
 http://patchwork.ozlabs.org/patch/120372/ ?

update your patch to take the new code into account.  you're going to have to 
rebase anyways to get it merged.
-mike


signature.asc
Description: This is a digitally signed message part.
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

Re: [U-Boot] [PATCH] tools/env: allow overwrite of ethaddr on default

[Wolfgang Denk]

Dear Grant Erickson,

In message 1324580395-27004-1-git-send-email-maratho...@gmail.com you wrote:
 This patch allows the U-Boot user space companion utility, fw_setenv,
 to overwrite the 'ethaddr' key/value pair if the current value is set
 to a per-board-configured default.
 
 This change allows 'fw_setenv' to match the behavior of 'setenv' /
 'env set' on the U-Boot command line.
 
 Signed-off-by: Grant Erickson maratho...@gmail.com
 ---
  tools/env/fw_env.c |   14 --
  1 files changed, 12 insertions(+), 2 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH, MD: Wolfgang Denk  Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: w...@denx.de
The Buddha, the Godhead, resides quite as comfortably in the circuits
of a digital computer or the gears of a cycle transmission as he does
at the top of a mountain or in the petals of a flower.
- R.  Pirsig, Zen and the Art of Motorcycle Maintenance
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

[U-Boot] [PATCH] tools/env: allow overwrite of ethaddr on default

[Grant Erickson]

This patch allows the U-Boot user space companion utility, fw_setenv,
to overwrite the 'ethaddr' key/value pair if the current value is set
to a per-board-configured default.

This change allows 'fw_setenv' to match the behavior of 'setenv' /
'env set' on the U-Boot command line.

Signed-off-by: Grant Erickson maratho...@gmail.com
---
 tools/env/fw_env.c |   14 --
 1 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/tools/env/fw_env.c b/tools/env/fw_env.c
index 996682e..2185be9 100644
--- a/tools/env/fw_env.c
+++ b/tools/env/fw_env.c
@@ -45,6 +45,8 @@
 
 #include fw_env.h
 
+#include config.h
+
 #define WHITESPACE(c) ((c == '\t') || (c == ' '))
 
 #define min(x, y) ({   \
@@ -390,15 +392,23 @@ int fw_env_write(char *name, char *value)
 * Delete any existing definition
 */
if (oldval) {
+#ifndef CONFIG_ENV_OVERWRITE
+
/*
 * Ethernet Address and serial# can be set only once
 */
-   if ((strcmp (name, ethaddr) == 0) ||
-   (strcmp (name, serial#) == 0)) {
+   if (
+   (strcmp(name, serial#) == 0) ||
+   ((strcmp(name, ethaddr) == 0)
+#if defined(CONFIG_OVERWRITE_ETHADDR_ONCE)  defined(CONFIG_ETHADDR)
+(strcmp(oldval, MK_STR(CONFIG_ETHADDR)) != 0)
+#endif /* CONFIG_OVERWRITE_ETHADDR_ONCE  CONFIG_ETHADDR */
+  ) ) {
fprintf (stderr, Can't overwrite \%s\\n, name);
errno = EROFS;
return -1;
}
+#endif /* CONFIG_ENV_OVERWRITE */
 
if (*++nxt == '\0') {
*env = '\0';
-- 
1.7.7.3

___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot