Commit f3b6d528 authored by Grant Erickson's avatar Grant Erickson Committed by Wolfgang Denk

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: default avatarGrant Erickson <gerickson@nuovations.com>
parent 7ea8325b
......@@ -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
......
......@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment