From f3b6d528e4dd719640a4bfcd954f4e4c7f5db0d6 Mon Sep 17 00:00:00 2001
From: Grant Erickson <gerickson@nuovations.com>
Date: Tue, 6 May 2008 16:18:00 -0700
Subject: [PATCH] Fix Compilation Errors with 'tools/env/fw_printenv'

In the current top-of-tree, 1.3.3.-rc2, the optional tool
'tools/env/fw_printenv' fails to compile for two reasons:

1) The header watchdog.h cannot be found.
2) The header zlib.h is picked up from the tool chain rather than the
   project causing a prototype conflict for crc32.

This patch addresses both of these issues.

Platforms Tested On:
- AMCC "Kilauea"

Signed-off-by: Grant Erickson <gerickson@nuovations.com>
---
 lib_generic/crc32.c | 2 ++
 tools/env/Makefile  | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib_generic/crc32.c b/lib_generic/crc32.c
index 64f66ed6fb..83d1d1d3a0 100644
--- a/lib_generic/crc32.c
+++ b/lib_generic/crc32.c
@@ -14,7 +14,9 @@
 #include <stdint.h>
 #endif
 
+#if defined(CONFIG_HW_WATCHDOG) || defined(CONFIG_WATCHDOG)
 #include <watchdog.h>
+#endif
 #include "zlib.h"
 
 #define local static
diff --git a/tools/env/Makefile b/tools/env/Makefile
index ea2d5b5a01..9629ee58ef 100644
--- a/tools/env/Makefile
+++ b/tools/env/Makefile
@@ -26,7 +26,7 @@ include $(TOPDIR)/config.mk
 SRCS	:= $(obj)crc32.c  fw_env.c  fw_env_main.c
 HEADERS	:= fw_env.h
 
-CPPFLAGS := -Wall -DUSE_HOSTCC
+CPPFLAGS := -Wall -DUSE_HOSTCC -I$(SRCTREE)/include
 
 ifeq ($(MTD_VERSION),old)
 CPPFLAGS += -DMTD_OLD
-- 
2.25.1