Merge 4.16
Change-Id: I11db70a8e25a6656c5ec640a703e7b06d5a3672e
This commit is contained in:
@@ -46,6 +46,8 @@ classes-$(CONFIG_LP_CBFS) += libcbfs
|
||||
classes-$(CONFIG_LP_LZMA) += liblzma
|
||||
classes-$(CONFIG_LP_LZ4) += liblz4
|
||||
classes-$(CONFIG_LP_REMOTEGDB) += libgdb
|
||||
classes-$(CONFIG_LP_VBOOT_LIB) += vboot_fw
|
||||
classes-$(CONFIG_LP_VBOOT_LIB) += tlcl
|
||||
libraries := $(classes-y)
|
||||
classes-y += head.o
|
||||
|
||||
@@ -55,9 +57,12 @@ subdirs-$(CONFIG_LP_CURSES) += curses
|
||||
subdirs-$(CONFIG_LP_CBFS) += libcbfs
|
||||
subdirs-$(CONFIG_LP_LZMA) += liblzma
|
||||
subdirs-$(CONFIG_LP_LZ4) += liblz4
|
||||
subdirs-$(CONFIG_LP_VBOOT_LIB) += vboot
|
||||
|
||||
INCLUDES := -Iinclude -Iinclude/$(ARCHDIR-y) -I$(obj)
|
||||
INCLUDES += -include include/kconfig.h -include include/compiler.h
|
||||
INCLUDES += -I$(coreboottop)/src/commonlib/bsd/include
|
||||
INCLUDES += -I$(VBOOT_SOURCE)/firmware/include
|
||||
|
||||
CFLAGS += $(INCLUDES) -Os -pipe -nostdinc -ggdb3
|
||||
CFLAGS += -nostdlib -fno-builtin -ffreestanding -fomit-frame-pointer
|
||||
@@ -90,11 +95,11 @@ includes-handler= \
|
||||
|
||||
$(obj)/libpayload.a: $(foreach class,$(libraries),$$($(class)-objs))
|
||||
printf " AR $(subst $(CURDIR)/,,$(@))\n"
|
||||
$(AR) rc $@ $^
|
||||
printf "create $@\n$(foreach objc,$(filter-out %.a,$^),addmod $(objc)\n)$(foreach lib,$(filter %.a,$^),addlib $(lib)\n)save\nend\n" | $(AR) -M
|
||||
|
||||
$(obj)/%.a: $$(%-objs)
|
||||
printf " AR $(subst $(CURDIR)/,,$(@))\n"
|
||||
$(AR) rc $@ $^
|
||||
printf "create $@\n$(foreach objc,$(filter-out %.a,$^),addmod $(objc)\n)$(foreach lib,$(filter %.a,$^),addlib $(lib)\n)save\nend\n" | $(AR) -M
|
||||
|
||||
$(obj)/head.o: $(obj)/arch/$(ARCHDIR-y)/head.head.o.o
|
||||
printf " CP $(subst $(CURDIR)/,,$(@))\n"
|
||||
@@ -115,10 +120,24 @@ install: real-target
|
||||
install -m 755 -d $(DESTDIR)/libpayload/`dirname $$file`; \
|
||||
install -m 644 $$file $(DESTDIR)/libpayload/$$file; \
|
||||
done
|
||||
for file in `find $(coreboottop)/src/commonlib/bsd/include -name *.h -type f`; do \
|
||||
dest_file=$$(realpath --relative-to=$(coreboottop)/src/commonlib/bsd/ $$file); \
|
||||
install -m 755 -d "$(DESTDIR)/libpayload/`dirname $$dest_file`"; \
|
||||
install -m 644 "$$file" "$(DESTDIR)/libpayload/$$dest_file"; \
|
||||
done
|
||||
install -m 644 $(obj)/libpayload-config.h $(DESTDIR)/libpayload/include
|
||||
$(foreach item,$(includes), \
|
||||
install -m 755 -d $(DESTDIR)/libpayload/include/$(call extract_nth,2,$(item)); \
|
||||
install -m 644 $(call extract_nth,1,$(item)) $(DESTDIR)/libpayload/include/$(call extract_nth,2,$(item)); )
|
||||
printf " INSTALL $(DESTDIR)/libpayload/vboot\n"
|
||||
install -m 755 -d $(DESTDIR)/libpayload/vboot
|
||||
for file in `find $(VBOOT_SOURCE)/firmware/include \
|
||||
$(VBOOT_SOURCE)/firmware/2lib/include \
|
||||
-iname '*.h' -type f \
|
||||
| sed 's,$(VBOOT_SOURCE)/firmware/,,'`; do \
|
||||
install -m 755 -d $(DESTDIR)/libpayload/vboot/$$(dirname $$file); \
|
||||
install -m 644 $(VBOOT_SOURCE)/firmware/$$file $(DESTDIR)/libpayload/vboot/$$file ; \
|
||||
done
|
||||
printf " INSTALL $(DESTDIR)/libpayload/bin\n"
|
||||
install -m 755 -d $(DESTDIR)/libpayload/bin
|
||||
install -m 755 bin/lpgcc $(DESTDIR)/libpayload/bin
|
||||
|
Reference in New Issue
Block a user