aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Rossignol <aarossig@google.com>2017-08-08 14:39:00 -0700
committerAndrew Rossignol <aarossig@google.com>2017-08-15 17:02:13 -0700
commite7d3b3615180f1290497db73ff223d3f331ebb2b (patch)
treefc9449ccd4266016d8bba49e3712fcfdb91feec5
parent9aa803b245a52461a468f80cfc695dcbfb801254 (diff)
downloadchre-e7d3b3615180f1290497db73ff223d3f331ebb2b.tar.gz
Adds a google_hexagonv62_slpi-uimg variant
- Allows compiling the CHRE runtime for Hexagon V62 running in uImage. Bug: 63601374 Test: make google_hexagonv62_slpi-uimg Change-Id: Iec479a99158b1bec12ba6f43c8438f9d14186047
-rw-r--r--Makefile1
-rw-r--r--build/nanoapp/app.mk1
-rw-r--r--build/variant/google_hexagonv62_slpi-uimg.mk31
3 files changed, 33 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 386094fa..64808bd0 100644
--- a/Makefile
+++ b/Makefile
@@ -80,5 +80,6 @@ include build/common.mk
# google_cm4_nanohub as Nanohub itself is a CHRE implementation.
include $(CHRE_PREFIX)/build/variant/google_hexagonv60_slpi.mk
include $(CHRE_PREFIX)/build/variant/google_hexagonv62_slpi.mk
+include $(CHRE_PREFIX)/build/variant/google_hexagonv62_slpi-uimg.mk
include $(CHRE_PREFIX)/build/variant/google_x86_linux.mk
include $(CHRE_PREFIX)/build/variant/google_x86_googletest.mk
diff --git a/build/nanoapp/app.mk b/build/nanoapp/app.mk
index 50aba3fb..b958fb2e 100644
--- a/build/nanoapp/app.mk
+++ b/build/nanoapp/app.mk
@@ -81,6 +81,7 @@ include $(CHRE_PREFIX)/build/common.mk
include $(CHRE_PREFIX)/build/variant/google_cm4_nanohub.mk
include $(CHRE_PREFIX)/build/variant/google_hexagonv60_slpi.mk
include $(CHRE_PREFIX)/build/variant/google_hexagonv62_slpi.mk
+include $(CHRE_PREFIX)/build/variant/google_hexagonv62_slpi-uimg.mk
include $(CHRE_PREFIX)/build/variant/google_x86_linux.mk
include $(CHRE_PREFIX)/build/variant/qcom_hexagonv60_nanohub.mk
include $(CHRE_PREFIX)/build/variant/qcom_hexagonv60_nanohub-uimg.mk
diff --git a/build/variant/google_hexagonv62_slpi-uimg.mk b/build/variant/google_hexagonv62_slpi-uimg.mk
new file mode 100644
index 00000000..2b09a595
--- /dev/null
+++ b/build/variant/google_hexagonv62_slpi-uimg.mk
@@ -0,0 +1,31 @@
+#
+# Google CHRE Reference Implementation for Hexagon v62 Architecture on SLPI
+#
+
+include $(CHRE_PREFIX)/build/clean_build_template_args.mk
+
+TARGET_NAME = google_hexagonv62_slpi-uimg
+# Sized based on the buffer allocated in the host daemon (4096 bytes), minus
+# FlatBuffer overhead (max 80 bytes), minus some extra space to make a nice
+# round number and allow for addition of new fields to the FlatBuffer
+TARGET_CFLAGS = -DCHRE_MESSAGE_TO_HOST_MAX_SIZE=4000
+TARGET_CFLAGS += -mno-pic-data-is-text-relative
+TARGET_CFLAGS += -DCHRE_SLPI_UIMG_ENABLED
+TARGET_CFLAGS += $(GOOGLE_HEXAGONV62_SLPI-UIMG_CFLAGS)
+TARGET_VARIANT_SRCS = $(GOOGLE_HEXAGONV62_SLPI-UIMG_SRCS)
+TARGET_SO_LATE_LIBS = $(GOOGLE_HEXAGONV62_SLPI-UIMG_LATE_LIBS)
+HEXAGON_ARCH = v62
+
+# Enable uImage support.
+TARGET_VARIANT_SRCS += $(SYS_SUPPORT_PATH)/qcom/uimg_dl_ver.c
+TARGET_SO_LDFLAGS += --script=$(SYS_SUPPORT_PATH)/qcom/uimage.lcs.toolv80
+
+ifneq ($(filter $(TARGET_NAME)% all, $(MAKECMDGOALS)),)
+ifneq ($(IS_NANOAPP_BUILD),)
+TARGET_SO_LATE_LIBS += $(CHRE_PREFIX)/build/app_support/google_slpi/libchre_slpi_skel.so
+include $(CHRE_PREFIX)/build/nanoapp/google_slpi.mk
+endif
+
+include $(CHRE_PREFIX)/build/arch/hexagon.mk
+include $(CHRE_PREFIX)/build/build_template.mk
+endif