diff mbox

[U-Boot,v2,5/7] mv_common.c: don't compile reset_environment if ENV_IS_NOWHERE

Message ID 1311000325-8030-1-git-send-email-michael.jones@matrix-vision.de
State Accepted
Headers show

Commit Message

Michael Jones July 18, 2011, 2:45 p.m. UTC 
Doesn't make sense to provide this function to boards which defined
CONFIG_ENV_IS_NOWHERE. Such a board gets a linking error because
common/env_nowhere.c doesn't define saveenv().

Signed-off-by: Michael Jones <michael.jones@matrix-vision.de>
---
Changes for v2:
  - None. Resubmitting to include custodian in cc:

 board/matrix_vision/common/mv_common.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

Comments

Wolfgang Denk July 28, 2011, 2:49 p.m. UTC | #1 
Dear Michael Jones,

In message <1311000325-8030-1-git-send-email-michael.jones@matrix-vision.de> you wrote:
> Doesn't make sense to provide this function to boards which defined
> CONFIG_ENV_IS_NOWHERE. Such a board gets a linking error because
> common/env_nowhere.c doesn't define saveenv().
> 
> Signed-off-by: Michael Jones <michael.jones@matrix-vision.de>
> ---
> Changes for v2:
>   - None. Resubmitting to include custodian in cc:
> 
>  board/matrix_vision/common/mv_common.c |    2 ++
>  1 files changed, 2 insertions(+), 0 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk
diff mbox

Patch

diff --git a/board/matrix_vision/common/mv_common.c b/board/matrix_vision/common/mv_common.c
index 0afc535..404c8b4 100644
--- a/board/matrix_vision/common/mv_common.c
+++ b/board/matrix_vision/common/mv_common.c
@@ -38,6 +38,7 @@  static char* entries_to_keep[] = {
 #define MV_MAX_ENV_ENTRY_LENGTH	64
 #define MV_KEEP_ENTRIES		ARRAY_SIZE(entries_to_keep)
 
+#ifndef CONFIG_ENV_IS_NOWHERE
 void mv_reset_environment(void)
 {
 	int i;
@@ -67,6 +68,7 @@  void mv_reset_environment(void)
 
 	saveenv();
 }
+#endif
 
 int mv_load_fpga(void)
 {