diff options
| author | Grant Erickson <gerickson@nuovations.com> | 2008-05-06 16:18:00 -0700 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-05-09 23:04:41 +0200 |
| commit | f3b6d528e4dd719640a4bfcd954f4e4c7f5db0d6 (patch) | |
| tree | 03337ee79651b01b5bb57b0c3bacf29f6491d915 | |
| parent | 7ea8325b41e02bf0a84ef3eafa686730886977a8 (diff) | |
| download | olio-uboot-2014.01-f3b6d528e4dd719640a4bfcd954f4e4c7f5db0d6.tar.xz olio-uboot-2014.01-f3b6d528e4dd719640a4bfcd954f4e4c7f5db0d6.zip | |
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>
| -rw-r--r-- | lib_generic/crc32.c | 2 | ||||
| -rw-r--r-- | tools/env/Makefile | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/lib_generic/crc32.c b/lib_generic/crc32.c index 64f66ed6f..83d1d1d3a 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 ea2d5b5a0..9629ee58e 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 |