aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitmodules2
-rw-r--r--Makefile.inc9
-rw-r--r--util/nvidia/Makefile.inc48
m---------util/nvidia/cbootimage (renamed from util/nvidia-cbootimage)0
4 files changed, 50 insertions, 9 deletions
diff --git a/.gitmodules b/.gitmodules
index a7a9d4321..ee3f1ea9e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,5 +4,5 @@
update = none
ignore = dirty
[submodule "util/nvidia-cbootimage"]
- path = util/nvidia-cbootimage
+ path = util/nvidia/cbootimage
url = ../nvidia-cbootimage.git
diff --git a/Makefile.inc b/Makefile.inc
index 382eead01..d307c60de 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -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
diff --git a/util/nvidia/Makefile.inc b/util/nvidia/Makefile.inc
new file mode 100644
index 000000000..c8be3bbab
--- /dev/null
+++ b/util/nvidia/Makefile.inc
@@ -0,0 +1,48 @@
+# 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 $@
diff --git a/util/nvidia-cbootimage b/util/nvidia/cbootimage
-Subproject 62a83faac08dba2591c5e188a0c8257dd64c956
+Subproject 62a83faac08dba2591c5e188a0c8257dd64c956