summaryrefslogtreecommitdiffstats
path: root/util/cbfstool/Makefile
diff options
context:
space:
mode:
authorRonald G. Minnich <rminnich@google.com>2013-12-03 11:13:35 -0800
committerAlexandru Gagniuc <mr.nuke.me@gmail.com>2014-01-29 20:03:44 +0100
commitaa2f739ae87386b8a29068ecfdc2b25bcf4a19ca (patch)
tree7d69d6c6edc92c633ff6138f6d8b626151522c0a /util/cbfstool/Makefile
parent8449b5e0a9e5eca3c91c1d9351d5f21eaa0ba582 (diff)
downloadcoreboot-aa2f739ae87386b8a29068ecfdc2b25bcf4a19ca.tar.gz
coreboot-aa2f739ae87386b8a29068ecfdc2b25bcf4a19ca.tar.bz2
coreboot-aa2f739ae87386b8a29068ecfdc2b25bcf4a19ca.zip
cbfs: fix issues with word size and endianness.
Add XDR functions and use them to convert the ELF headers to native headers, using the Elf64 structs to ensure we accomodate all word sizes. Also, use these XDR functions for output. This may seem overly complex but it turned out to be much the easiest way to do this. Note that the basic elf parsing function in cbfs-mkstage.c now works over all ELF files, for all architectures, endian, and word size combinations. At the same time, the basic elf parsing in cbfs-mkstage.c is a loop that has no architecture-specific conditionals. Add -g to the LDFLAGS while we're here. It's on the CFLAGS so there is no harm done. This code has been tested on all chromebooks that use coreboot to date. I added most of the extra checks from ChromeOS and they triggered a lot of warnings, hence the other changes. I had to take -Wshadow back out due to the many errors it triggers in LZMA. BUG=None TEST=Build and boot for Peppy; works fine. Build and boot for nyan, works fine. Build for qemu targets and armv8 targets. BRANCH=None Change-Id: I5a4cee9854799189115ac701e22efc406a8d902f Signed-off-by: Ronald G. Minnich <rminnich@google.com> Reviewed-on: https://chromium-review.googlesource.com/178606 Reviewed-by: Ronald Minnich <rminnich@chromium.org> Commit-Queue: Ronald Minnich <rminnich@chromium.org> Tested-by: Ronald Minnich <rminnich@chromium.org> Reviewed-on: http://review.coreboot.org/4817 Reviewed-by: Alexandru Gagniuc <mr.nuke.me@gmail.com> Tested-by: build bot (Jenkins) Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
Diffstat (limited to 'util/cbfstool/Makefile')
-rw-r--r--util/cbfstool/Makefile14
1 files changed, 10 insertions, 4 deletions
diff --git a/util/cbfstool/Makefile b/util/cbfstool/Makefile
index 3aa5edc718c5..5e4fdcbd7ba7 100644
--- a/util/cbfstool/Makefile
+++ b/util/cbfstool/Makefile
@@ -1,13 +1,19 @@
obj ?= $(shell pwd)
-HOSTCC ?= gcc
-CFLAGS ?= -g -Wall -Werror
-CFLAGS += -D_7ZIP_ST
+HOSTCC ?= gcc
+CFLAGS ?= -g
+CFLAGS += -D_7ZIP_ST
+CFLAGS += -Wall -Wundef -Wstrict-prototypes -Wmissing-prototypes
+CFLAGS += -Wwrite-strings -Wredundant-decls -Wno-trigraphs
+CFLAGS += -Wstrict-aliasing -Werror
+# You're going to have to fix the LzmaEnc.c first -- it's horrible.
+# CFLAGS += -Wshadow
+LDFLAGS += -g
BINARY:=$(obj)/cbfstool
COMMON:=cbfstool.o common.o cbfs_image.o compress.o fit.o
-COMMON+=cbfs-mkstage.o cbfs-mkpayload.o
+COMMON+=cbfs-mkstage.o cbfs-mkpayload.o xdr.o
# LZMA
COMMON+=lzma/lzma.o
COMMON+=lzma/C/LzFind.o lzma/C/LzmaDec.o lzma/C/LzmaEnc.o