diff options
| author | H. Peter Anvin <hpa@linux.intel.com> | 2012-03-28 20:11:36 (GMT) |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2012-03-28 20:11:36 (GMT) |
| commit | a9aff3eaaf0966c2a1bb3717d811363d81e52c76 (patch) | |
| tree | b442c3d554ff83529deb1783996f6359aebf07ab /tools/usb/Makefile | |
| parent | e47bb0bda46bf50f81671db502d0c903e0a32604 (diff) | |
| parent | a51f4047758d2bcd099ea113b833ed380f4024ba (diff) | |
| download | linux-fsl-qoriq-a9aff3eaaf0966c2a1bb3717d811363d81e52c76.tar.xz | |
Merge branch x86/build into x86/efi and fix up arch/x86/boot/tools/build.c
Reason for merge:
The updates to the EFI boot stub generation conflicted with the
changes to properly use the get/put_unaligned_le*() macros to
generate images.
This merge commit completes the conversion in
arch/x86/boot/tools/build.c including the places in the code
which had been changed on the x86/efi branch.
Resolved Conflicts:
arch/x86/boot/tools/build.c
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'tools/usb/Makefile')
| -rw-r--r-- | tools/usb/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/usb/Makefile b/tools/usb/Makefile index 8b704af..396d6c4 100644 --- a/tools/usb/Makefile +++ b/tools/usb/Makefile @@ -3,7 +3,7 @@ CC = $(CROSS_COMPILE)gcc PTHREAD_LIBS = -lpthread WARNINGS = -Wall -Wextra -CFLAGS = $(WARNINGS) -g $(PTHREAD_LIBS) +CFLAGS = $(WARNINGS) -g $(PTHREAD_LIBS) -I../include all: testusb ffs-test %: %.c |