From 5342a1a2ea5ce8c7ece7c0f2f4fdf4c4d202f045 Mon Sep 17 00:00:00 2001 From: Luka Perkov Date: Wed, 21 May 2014 09:42:33 +0000 Subject: mkimage: update to 2014.04 Signed-off-by: Luka Perkov SVN-Revision: 40807 --- tools/mkimage/patches/040-include_order.patch | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) (limited to 'tools/mkimage/patches/040-include_order.patch') diff --git a/tools/mkimage/patches/040-include_order.patch b/tools/mkimage/patches/040-include_order.patch index e4dc78e..f4fbbaf 100644 --- a/tools/mkimage/patches/040-include_order.patch +++ b/tools/mkimage/patches/040-include_order.patch @@ -1,14 +1,11 @@ --- a/tools/Makefile +++ b/tools/Makefile -@@ -160,9 +160,9 @@ - # Define __KERNEL_STRICT_NAMES to prevent typedef overlaps +@@ -173,7 +173,7 @@ + # Define _GNU_SOURCE to obtain the getline prototype from stdio.h # - HOSTCPPFLAGS = -include $(SRCTREE)/include/libfdt_env.h \ -- -idirafter $(SRCTREE)/include \ -+ -I $(SRCTREE)/include \ - -idirafter $(OBJTREE)/include2 \ -- -idirafter $(OBJTREE)/include \ -+ -I $(OBJTREE)/include \ - -I $(SRCTREE)/lib/libfdt \ - -I $(SRCTREE)/tools \ + HOST_EXTRACFLAGS += -include $(srctree)/include/libfdt_env.h \ +- $(patsubst -I%,-idirafter%, $(UBOOTINCLUDE)) \ ++ -I$(srctree)/include \ + -I$(srctree)/lib/libfdt \ + -I$(srctree)/tools \ -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \ -- cgit v1.1