[U-Boot-Users] [PATCH] fix building when saveenv is disabled in some setups
If you enable environment in the flash, but disable the embedded option, and you disable the saveenv command, then the #if nested logic will trigger a compile failure: env_flash.c: In function ‘env_relocate_spec’: env_flash.c:399: error: ‘flash_addr’ undeclared (first use in this function) The fix is to add CMD_SAVEENV ifdef protection like everywhere else.
Signed-off-by: Mike Frysinger vapier@gentoo.org --- common/env_flash.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/common/env_flash.c b/common/env_flash.c index eccfb62..a92160d 100644 --- a/common/env_flash.c +++ b/common/env_flash.c @@ -378,7 +378,9 @@ void env_relocate_spec (void) puts ("*** Warning - some problems detected " "reading environment; recovered successfully\n\n"); #endif /* CFG_ENV_ADDR_REDUND */ +#ifdef CMD_SAVEENV memcpy (env_ptr, (void*)flash_addr, CFG_ENV_SIZE); +#endif #endif /* ! ENV_IS_EMBEDDED || CFG_ENV_ADDR_REDUND */ }
In message 1209766670-19815-1-git-send-email-vapier@gentoo.org you wrote:
SWYgeW91IGVuYWJsZSBlbnZpcm9ubWVudCBpbiB0aGUgZmxhc2gsIGJ1dCBkaXNhYmxlIHRoZSBl bWJlZGRlZCBvcHRpb24sCmFuZCB5b3UgZGlzYWJsZSB0aGUgc2F2ZWVudiBjb21tYW5kLCB0aGVu IHRoZSAjaWYgbmVzdGVkIGxvZ2ljIHdpbGwgdHJpZ2dlcgphIGNvbXBpbGUgZmFpbHVyZToKZW52 X2ZsYXNoLmM6IEluIGZ1bmN0aW9uIOKAmGVudl9yZWxvY2F0ZV9zcGVj4oCZOgplbnZfZmxhc2gu YzozOTk6IGVycm9yOiDigJhmbGFzaF9hZGRy4oCZIHVuZGVjbGFyZWQgKGZpcnN0IHVzZSBpbiB0 aGlzIGZ1bmN0aW9uKQpUaGUgZml4IGlzIHRvIGFkZCBDTURfU0FWRUVOViBpZmRlZiBwcm90ZWN0 aW9uIGxpa2UgZXZlcnl3aGVyZSBlbHNlLgoKU2lnbmVkLW9mZi1ieTogTWlrZSBGcnlzaW5nZXIg PHZhcGllckBnZW50b28ub3JnPgotLS0KIGNvbW1vbi9lbnZfZmxhc2guYyB8ICAgIDIgKysKIDEg ZmlsZXMgY2hhbmdlZCwgMiBpbnNlcnRpb25zKCspLCAwIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdp dCBhL2NvbW1vbi9lbnZfZmxhc2guYyBiL2NvbW1vbi9lbnZfZmxhc2guYwppbmRleCBlY2NmYjYy Li5hOTIxNjBkIDEwMDY0NAotLS0gYS9jb21tb24vZW52X2ZsYXNoLmMKKysrIGIvY29tbW9uL2Vu dl9mbGFzaC5jCkBAIC0zNzgsNyArMzc4LDkgQEAgdm9pZCBlbnZfcmVsb2NhdGVfc3BlYyAodm9p ZCkKIAkJcHV0cyAoIioqKiBXYXJuaW5nIC0gc29tZSBwcm9ibGVtcyBkZXRlY3RlZCAiCiAJCSAg ICAgICJyZWFkaW5nIGVudmlyb25tZW50OyByZWNvdmVyZWQgc3VjY2Vzc2Z1bGx5XG5cbiIpOwog I2VuZGlmIC8qIENGR19FTlZfQUREUl9SRURVTkQgKi8KKyNpZmRlZiBDTURfU0FWRUVOVgogCW1l bWNweSAoZW52X3B0ciwgKHZvaWQqKWZsYXNoX2FkZHIsIENGR19FTlZfU0laRSk7CisjZW5kaWYK ICNlbmRpZiAvKiAhIEVOVl9JU19FTUJFRERFRCB8fCBDRkdfRU5WX0FERFJfUkVEVU5EICovCiB9 CiAKLS0gCjEuNS41LjEKCgotLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tClRoaXMgU0YubmV0IGVtYWlsIGlzIHNw b25zb3JlZCBieSB0aGUgMjAwOCBKYXZhT25lKFNNKSBDb25mZXJlbmNlIApEb24ndCBtaXNzIHRo aXMgeWVhcidzIGV4Y2l0aW5nIGV2ZW50LiBUaGVyZSdzIHN0aWxsIHRpbWUgdG8gc2F2ZSAkMTAw LiAKVXNlIHByaW9yaXR5IGNvZGUgSjhUTDJEMi4gCmh0dHA6Ly9hZC5kb3VibGVjbGljay5uZXQv Y2xrOzE5ODc1NzY3MzsxMzUwMzAzODtwP2h0dHA6Ly9qYXZhLnN1bi5jb20vamF2YW9uZQpfX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpVLUJvb3QtVXNlcnMg bWFpbGluZyBsaXN0ClUtQm9vdC1Vc2Vyc0BsaXN0cy5zb3VyY2Vmb3JnZS5uZXQKaHR0cHM6Ly9s aXN0cy5zb3VyY2Vmb3JnZS5uZXQvbGlzdHMvbGlzdGluZm8vdS1ib290LXVzZXJzCg==
Please do not send base 64 encoded messages.
Please send plain text only.
If you enable environment in the flash, but disable the embedded option, and you disable the saveenv command, then the #if nested logic will trigger a compile failure: env_flash.c: In function `env_relocate_spec': env_flash.c:399: error: `flash_addr' undeclared (first use in this function) The fix is to add CMD_SAVEENV ifdef protection like everywhere else.
Signed-off-by: Mike Frysinger vapier@gentoo.org
common/env_flash.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
Applied, thanks.
Best regards,
Wolfgang Denk
On Saturday 03 May 2008, Wolfgang Denk wrote:
In message 1209766670-19815-1-git-send-email-vapier@gentoo.org you wrote:
SWYgeW91IGVuYWJsZSBlbnZpcm9ubWVudCBpbiB0aGUgZmxhc2gsIGJ1dCBkaXNhYmxlIHRoZ bWFpbGluZyBsaXN0ClUtQm9vdC1Vc2Vyc0BsaXN0cy5zb3VyY2Vmb3JnZS5uZXQKaHR0cHM6L
Please do not send base 64 encoded messages.
Please send plain text only.
complain to git. i just used `git-send-email`. -mike
participants (2)
-
Mike Frysinger -
Wolfgang Denk