Commit 758f26aa authored by Patrick Georgi's avatar Patrick Georgi
Browse files

nvidia/cbootimage: avoid upstream's build system



It brings in useless dependencies, a weird autotools
configuration, and tons of pain everywhere.

Instead just build things ourselves.

Change-Id: I67f06e711cb9dcd594363bc1a4f99d3273074549
Signed-off-by: default avatarPatrick Georgi <patrick@georgi-clan.de>
Reviewed-on: http://review.coreboot.org/6986


Tested-by: build bot (Jenkins)
Reviewed-by: default avatarRonald G. Minnich <rminnich@gmail.com>
parent e87ee144
......@@ -4,5 +4,5 @@
update = none
ignore = dirty
[submodule "util/nvidia-cbootimage"]
path = util/nvidia-cbootimage
path = util/nvidia/cbootimage
url = ../nvidia-cbootimage.git
......@@ -308,14 +308,7 @@ $(FLETCHER): $(top)/util/fletcher/fletcher.c
CBOOTIMAGE:=$(objutil)/cbootimage/cbootimage
$(CBOOTIMAGE): $(top)/util/nvidia-cbootimage/Makefile
@printf " MAKE $(subst $(obj)/,,$(@))\n"
$(MAKE) -C $(top)/util/nvidia-cbootimage
cp $(top)/util/nvidia-cbootimage/src/cbootimage $@
$(top)/util/nvidia-cbootimage/Makefile:
cd $(top)/util/nvidia-cbootimage/; \
./autogen.sh >/dev/null
subdirs-y += util/nvidia
#######################################################################
# needed objects that every mainboard uses
......
# copied from cbootimage/src/Makefile.am
CBOOTIMAGE_RAW_SRCS:= \
cbootimage.c \
data_layout.c \
set.c \
crypto.c \
aes_ref.c \
context.c \
parse.c \
t132/parse_t132.c \
t124/parse_t124.c \
t114/parse_t114.c \
t30/parse_t30.c \
t20/parse_t20.c \
t132/nvbctlib_t132.c \
t124/nvbctlib_t124.c \
t114/nvbctlib_t114.c \
t30/nvbctlib_t30.c \
t20/nvbctlib_t20.c \
cbootimage.h \
context.h \
crypto.h \
data_layout.h \
nvaes_ref.h \
parse.h \
set.h \
t20/nvboot_bct_t20.h \
t20/nvboot_sdram_param_t20.h \
t30/nvboot_bct_t30.h \
t30/nvboot_sdram_param_t30.h \
t114/nvboot_bct_t114.h \
t114/nvboot_sdram_param_t114.h \
t124/nvboot_bct_t124.h \
t124/nvboot_sdram_param_t124.h \
t132/nvboot_bct_t132.h \
t132/nvboot_sdram_param_t132.h
CBOOTIMAGE_SRCS:=$(addprefix util/nvidia/cbootimage/src/,$(filter %.c,$(CBOOTIMAGE_RAW_SRCS)))
CBOOTIMAGE_OBJS:=$(addprefix $(objutil)/nvidia/cbootimage/,$(patsubst %.c,%.o,$(filter %.c,$(CBOOTIMAGE_RAW_SRCS))))
additional-dirs += $(sort $(dir $(CBOOTIMAGE_OBJS)))
$(objutil)/nvidia/cbootimage/%.o: util/nvidia/cbootimage/src/%.c
gcc -c -o $@ $<
$(CBOOTIMAGE): $(CBOOTIMAGE_OBJS)
gcc -o $@.tmp $^ -lm
mv $@.tmp $@
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment