aboutsummaryrefslogtreecommitdiffstats
path: root/package/uboot-envtools/patches/002-makefile.patch
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2011-10-24 21:49:24 +0000
committerGabor Juhos <juhosg@openwrt.org>2011-10-24 21:49:24 +0000
commit61441fe2de5698cb3d7d66ea53bda84116f7c5b2 (patch)
treecdba213ef754396545faec4bacae5cf0772c1df1 /package/uboot-envtools/patches/002-makefile.patch
parent0ab6be2ba3ecab7f7295d658768464c4907825a7 (diff)
downloadupstream-61441fe2de5698cb3d7d66ea53bda84116f7c5b2.tar.gz
upstream-61441fe2de5698cb3d7d66ea53bda84116f7c5b2.tar.bz2
upstream-61441fe2de5698cb3d7d66ea53bda84116f7c5b2.zip
package/u-boot-envtools: update to version 2011.06.
This updates uboot-envtools to the version which comes with U-Boot 2011.06. The important novelity is that fw_setenv now supports batch processing, which greatly improves sysupgrade of the ALL0258N as otherwise we would have to overwrite uboot-env up to 8x in a single firmware upgrade. Unfortunately, no newer version of the sources is available from Debian, so we got to take it from the u-boot source which is kinda ugly... Signed-off-by: Daniel Golle <dgolle@allnet.de> SVN-Revision: 28566
Diffstat (limited to 'package/uboot-envtools/patches/002-makefile.patch')
-rw-r--r--package/uboot-envtools/patches/002-makefile.patch29
1 files changed, 19 insertions, 10 deletions
diff --git a/package/uboot-envtools/patches/002-makefile.patch b/package/uboot-envtools/patches/002-makefile.patch
index 9dd8d82a6b..ddd08e19de 100644
--- a/package/uboot-envtools/patches/002-makefile.patch
+++ b/package/uboot-envtools/patches/002-makefile.patch
@@ -1,31 +1,39 @@
--- a/Makefile
+++ b/Makefile
-@@ -21,12 +21,10 @@
+@@ -21,37 +21,16 @@
# MA 02111-1307 USA
#
-include $(TOPDIR)/config.mk
-
- SRCS := $(obj)crc32.c fw_env.c fw_env_main.c
+-HOSTSRCS := $(obj)crc32.c fw_env.c fw_env_main.c
++SRCS := crc32.c fw_env.c fw_env_main.c
HEADERS := fw_env.h
--CPPFLAGS := -Wall -DUSE_HOSTCC -I$(SRCTREE)/include
+-# Compile for a hosted environment on the target
+-HOSTCPPFLAGS = -idirafter $(SRCTREE)/include \
+- -idirafter $(OBJTREE)/include2 \
+- -idirafter $(OBJTREE)/include \
+- -DUSE_HOSTCC
+-
+-ifeq ($(MTD_VERSION),old)
+-HOSTCPPFLAGS += -DMTD_OLD
+-endif
+CPPFLAGS := -Wall $(CFLAGS)
- ifeq ($(MTD_VERSION),old)
- CPPFLAGS += -DMTD_OLD
-@@ -35,18 +33,7 @@ endif
all: $(obj)fw_printenv
- $(obj)fw_printenv: $(SRCS) $(HEADERS)
-- $(CROSS_COMPILE)gcc $(CPPFLAGS) $(SRCS) -o $(obj)fw_printenv
+ # Some files complain if compiled with -pedantic, use HOSTCFLAGS_NOPED
+-$(obj)fw_printenv: $(HOSTSRCS) $(HEADERS)
+- $(HOSTCC) $(HOSTCFLAGS_NOPED) $(HOSTLDFLAGS) -o $@ $(HOSTSRCS)
++$(obj)fw_printenv: $(SRCS) $(HEADERS)
+ $(CC) $(CPPFLAGS) $(SRCS) -o $(obj)fw_printenv
clean:
- rm -f $(obj)fw_printenv $(obj)crc32.c
+- rm -f $(obj)fw_printenv $(obj)crc32.c
-
-$(obj)crc32.c:
-- ln -s $(src)../../lib_generic/crc32.c $(obj)crc32.c
+- ln -s $(src)../../lib/crc32.c $(obj)crc32.c
-
-#########################################################################
-
@@ -34,3 +42,4 @@
-sinclude $(obj).depend
-
-#########################################################################
++ rm -f $(obj)fw_printenv