Add Display Port Support

Eric Lee
1 parent c0a27c5176
Showing 4 changed files with 75 additions and 2 deletions Side-by-side Diff
imx8m/optee-packages.mk
imx8m/smarc_mx8mq/AndroidUboot.mk
imx8m/smarc_mx8mq/signed_dp_imx8m.bin
imx8m/smarc_mx8mq/smarc_mx8mq_drm.mk
+OPTEE_PLATFORM ?= imx
+ifeq ($(TARGET_PRODUCT),$(filter $(TARGET_PRODUCT),smarc_mx8mm smarc_mx8mm_drm))
+OPTEE_PLATFORM_FLAVOR ?= smarc_mx8mm
+else
+ifeq ($(TARGET_PRODUCT),$(filter $(TARGET_PRODUCT),smarc_mx8mq smarc_mx8mq_drm))
+OPTEE_PLATFORM_FLAVOR ?= smarc_mx8mq
+else
+$(error Invalid platform $(TARGET_PRODUCT))
+endif
+endif
+OPTEE_CFG_ARM64_CORE ?= y
+OPTEE_TA_TARGETS ?= ta_arm64
+CFG_SECSTOR_TA_MGMT_PTA ?= y
+#Force CFG_TA_DYNLINK=y to fix optee_test build
+#https://github.com/OP-TEE/optee_test/issues/275
+CFG_TA_DYNLINK := y
+#OPTEE_TA_TARGETS ?= ta_arm32
+OPTEE_OS_DIR ?= optee/optee_os
+OPTEE_EXTRA_FLAGS ?= CFG_TEE_CORE_LOG_LEVEL=1 CFG_TEE_TA_LOG_LEVEL=1 DEBUG=0
+ifeq ($(CFG_DRM_SECURE_DATA_PATH), y)
+OPTEE_EXTRA_FLAGS += CFG_IMXCRYPT=y
+OPTEE_EXTRA_FLAGS += CFG_DRM_SECURE_DATA_PATH=y
+OPTEE_EXTRA_FLAGS += CFG_SECURE_DATA_PATH=y
+OPTEE_EXTRA_FLAGS += CFG_TEE_SDP_MEM_BASE=$(CFG_TEE_SDP_MEM_BASE)
+OPTEE_EXTRA_FLAGS += CFG_TEE_SDP_MEM_SIZE=$(CFG_TEE_SDP_MEM_SIZE)
+OPTEE_EXTRA_FLAGS += CFG_TEE_SDP_NONCACHE=y
+ifeq ($(CFG_RDC_SECURE_DATA_PATH),y)
+OPTEE_EXTRA_FLAGS += CFG_RDC_SECURE_DATA_PATH=y
+OPTEE_EXTRA_FLAGS += CFG_RDC_DECODED_BUFFER=$(DECODED_BUFFER_START)
+endif
+else
+OPTEE_EXTRA_FLAGS += CFG_SECURE_DATA_PATH=n
+endif
+
+BUILD_OPTEE_MK := $(OPTEE_OS_DIR)/mk/aosp_optee.mk
+
+# OP TEE client library and service
+PRODUCT_PACKAGES += libteec \
+                    tee-supplicant \
+
+# optee_test and TA
+PRODUCT_PACKAGES += xtest
+# os_test
+PRODUCT_PACKAGES += 5b9e0e40-2636-11e1-ad9e-0002a5d5c51b.ta
+# concurrent_large
+PRODUCT_PACKAGES += 5ce0c432-0ab0-40e5-a056-782ca0e6aba2.ta
+# sha_perf
+PRODUCT_PACKAGES += 614789f2-39c0-4ebf-b235-92b32ac107ed.ta
+# storage2
+PRODUCT_PACKAGES += 731e279e-aafb-4575-a771-38caa6f0cca6.ta
+# storage
+PRODUCT_PACKAGES += b689f2a7-8adf-477a-9f99-32e90c0ad0a2.ta
+# create_fail_test
+PRODUCT_PACKAGES += c3f6e2c0-3548-11e1-b86c-0800200c9a66.ta
+# crypt
+PRODUCT_PACKAGES += cb3e5ba0-adf1-11e0-998b-0002a5d5c51b.ta
+# rpc_test
+PRODUCT_PACKAGES += d17f73a0-36ef-11e1-984a-0002a5d5c51b.ta
+# concurrent
+PRODUCT_PACKAGES += e13010e0-2ae1-11e5-896a-0002a5d5c51b.ta
+# aes_perf
+PRODUCT_PACKAGES += e626662e-c0e2-485c-b8c8-09fbce6edf3d.ta
+# sims
+PRODUCT_PACKAGES += e6a33ed4-562b-463a-bb7e-ff5e15a493c8.ta
+# storage_benchmark
+PRODUCT_PACKAGES += f157cda0-550c-11e5-a6fa-0002a5d5c51b.ta
+# socket
+PRODUCT_PACKAGES += 873bcd08-c2c3-11e6-a937-d0bf9c45c61c.ta
+# sdp-basic
+PRODUCT_PACKAGES += 12345678-5b69-11e4-9dbb-101f74f00099.ta
@@ -19,6 +19,9 @@
 	cp $(IMX_PATH)/arm-trusted-firmware/build/`echo $(2) | cut -d '-' -f1`/release/bl31.bin $(IMX_MKIMAGE_PATH)/imx-mkimage/iMX8M/bl31.bin; \
 	$(MAKE) -C $(IMX_MKIMAGE_PATH)/imx-mkimage/ clean; \
 	$(MAKE) -C $(IMX_MKIMAGE_PATH)/imx-mkimage/ SOC=iMX8M  flash_hdmi_spl_uboot 1>/dev/null || exit 1; \
-	cp $(IMX_MKIMAGE_PATH)/imx-mkimage/iMX8M/flash.bin $(PRODUCT_OUT)/u-boot-$(strip $(2)).imx;
+	cp $(IMX_MKIMAGE_PATH)/imx-mkimage/iMX8M/flash.bin $(PRODUCT_OUT)/u-boot-$(strip $(2)).imx; \
+        cp $(IMX_DEVICE_PATH)/signed_dp_imx8m.bin  $(IMX_MKIMAGE_PATH)/imx-mkimage/iMX8M/.; \
+        $(MAKE) -C $(IMX_MKIMAGE_PATH)/imx-mkimage/ SOC=iMX8M  flash_dp_spl_uboot 1>/dev/null || exit 1; \
+        cp $(IMX_MKIMAGE_PATH)/imx-mkimage/iMX8M/flash.bin $(PRODUCT_OUT)/u-boot-$(strip $(2))-dp.imx;
 endef
@@ -13,7 +13,7 @@
 	$(TOPDIR)device/fsl/imx8m/tee-supplicant.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/tee-supplicant.rc \
  
  
-$(call inherit-product, $(TOPDIR)device/fsl/imx8m/optee-packages.mk)
+$(call inherit-product, $(TOPDIR)device/embedian/imx8m/optee-packages.mk)
 $(call inherit-product, $(TOPDIR)$(IMX_DEVICE_PATH)/smarc_mx8mq.mk)
  
 TARGET_KERNEL_DEFCONFIG := smarcimx8m_android_defconfig
	1	+OPTEE_PLATFORM ?= imx
	2	+ifeq ($(TARGET_PRODUCT),$(filter $(TARGET_PRODUCT),smarc_mx8mm smarc_mx8mm_drm))
	3	+OPTEE_PLATFORM_FLAVOR ?= smarc_mx8mm
	4	+else
	5	+ifeq ($(TARGET_PRODUCT),$(filter $(TARGET_PRODUCT),smarc_mx8mq smarc_mx8mq_drm))
	6	+OPTEE_PLATFORM_FLAVOR ?= smarc_mx8mq
	7	+else
	8	+$(error Invalid platform $(TARGET_PRODUCT))
	9	+endif
	10	+endif
	11	+OPTEE_CFG_ARM64_CORE ?= y
	12	+OPTEE_TA_TARGETS ?= ta_arm64
	13	+CFG_SECSTOR_TA_MGMT_PTA ?= y
	14	+#Force CFG_TA_DYNLINK=y to fix optee_test build
	15	+#https://github.com/OP-TEE/optee_test/issues/275
	16	+CFG_TA_DYNLINK := y
	17	+#OPTEE_TA_TARGETS ?= ta_arm32
	18	+OPTEE_OS_DIR ?= optee/optee_os
	19	+OPTEE_EXTRA_FLAGS ?= CFG_TEE_CORE_LOG_LEVEL=1 CFG_TEE_TA_LOG_LEVEL=1 DEBUG=0
	20	+ifeq ($(CFG_DRM_SECURE_DATA_PATH), y)
	21	+OPTEE_EXTRA_FLAGS += CFG_IMXCRYPT=y
	22	+OPTEE_EXTRA_FLAGS += CFG_DRM_SECURE_DATA_PATH=y
	23	+OPTEE_EXTRA_FLAGS += CFG_SECURE_DATA_PATH=y
	24	+OPTEE_EXTRA_FLAGS += CFG_TEE_SDP_MEM_BASE=$(CFG_TEE_SDP_MEM_BASE)
	25	+OPTEE_EXTRA_FLAGS += CFG_TEE_SDP_MEM_SIZE=$(CFG_TEE_SDP_MEM_SIZE)
	26	+OPTEE_EXTRA_FLAGS += CFG_TEE_SDP_NONCACHE=y
	27	+ifeq ($(CFG_RDC_SECURE_DATA_PATH),y)
	28	+OPTEE_EXTRA_FLAGS += CFG_RDC_SECURE_DATA_PATH=y
	29	+OPTEE_EXTRA_FLAGS += CFG_RDC_DECODED_BUFFER=$(DECODED_BUFFER_START)
	30	+endif
	31	+else
	32	+OPTEE_EXTRA_FLAGS += CFG_SECURE_DATA_PATH=n
	33	+endif
	34	+
	35	+BUILD_OPTEE_MK := $(OPTEE_OS_DIR)/mk/aosp_optee.mk
	36	+
	37	+# OP TEE client library and service
	38	+PRODUCT_PACKAGES += libteec \
	39	+ tee-supplicant \
	40	+
	41	+# optee_test and TA
	42	+PRODUCT_PACKAGES += xtest
	43	+# os_test
	44	+PRODUCT_PACKAGES += 5b9e0e40-2636-11e1-ad9e-0002a5d5c51b.ta
	45	+# concurrent_large
	46	+PRODUCT_PACKAGES += 5ce0c432-0ab0-40e5-a056-782ca0e6aba2.ta
	47	+# sha_perf
	48	+PRODUCT_PACKAGES += 614789f2-39c0-4ebf-b235-92b32ac107ed.ta
	49	+# storage2
	50	+PRODUCT_PACKAGES += 731e279e-aafb-4575-a771-38caa6f0cca6.ta
	51	+# storage
	52	+PRODUCT_PACKAGES += b689f2a7-8adf-477a-9f99-32e90c0ad0a2.ta
	53	+# create_fail_test
	54	+PRODUCT_PACKAGES += c3f6e2c0-3548-11e1-b86c-0800200c9a66.ta
	55	+# crypt
	56	+PRODUCT_PACKAGES += cb3e5ba0-adf1-11e0-998b-0002a5d5c51b.ta
	57	+# rpc_test
	58	+PRODUCT_PACKAGES += d17f73a0-36ef-11e1-984a-0002a5d5c51b.ta
	59	+# concurrent
	60	+PRODUCT_PACKAGES += e13010e0-2ae1-11e5-896a-0002a5d5c51b.ta
	61	+# aes_perf
	62	+PRODUCT_PACKAGES += e626662e-c0e2-485c-b8c8-09fbce6edf3d.ta
	63	+# sims
	64	+PRODUCT_PACKAGES += e6a33ed4-562b-463a-bb7e-ff5e15a493c8.ta
	65	+# storage_benchmark
	66	+PRODUCT_PACKAGES += f157cda0-550c-11e5-a6fa-0002a5d5c51b.ta
	67	+# socket
	68	+PRODUCT_PACKAGES += 873bcd08-c2c3-11e6-a937-d0bf9c45c61c.ta
	69	+# sdp-basic
	70	+PRODUCT_PACKAGES += 12345678-5b69-11e4-9dbb-101f74f00099.ta
...	...	@@ -19,6 +19,9 @@
19	19	cp $(IMX_PATH)/arm-trusted-firmware/build/`echo $(2) \| cut -d '-' -f1`/release/bl31.bin $(IMX_MKIMAGE_PATH)/imx-mkimage/iMX8M/bl31.bin; \
20	20	$(MAKE) -C $(IMX_MKIMAGE_PATH)/imx-mkimage/ clean; \
21	21	$(MAKE) -C $(IMX_MKIMAGE_PATH)/imx-mkimage/ SOC=iMX8M flash_hdmi_spl_uboot 1>/dev/null \|\| exit 1; \
22		- cp $(IMX_MKIMAGE_PATH)/imx-mkimage/iMX8M/flash.bin $(PRODUCT_OUT)/u-boot-$(strip $(2)).imx;
	22	+ cp $(IMX_MKIMAGE_PATH)/imx-mkimage/iMX8M/flash.bin $(PRODUCT_OUT)/u-boot-$(strip $(2)).imx; \
	23	+ cp $(IMX_DEVICE_PATH)/signed_dp_imx8m.bin $(IMX_MKIMAGE_PATH)/imx-mkimage/iMX8M/.; \
	24	+ $(MAKE) -C $(IMX_MKIMAGE_PATH)/imx-mkimage/ SOC=iMX8M flash_dp_spl_uboot 1>/dev/null \|\| exit 1; \
	25	+ cp $(IMX_MKIMAGE_PATH)/imx-mkimage/iMX8M/flash.bin $(PRODUCT_OUT)/u-boot-$(strip $(2))-dp.imx;
23	26	endef
...	...	@@ -13,7 +13,7 @@
13	13	$(TOPDIR)device/fsl/imx8m/tee-supplicant.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/tee-supplicant.rc \
14	14
15	15
16		-$(call inherit-product, $(TOPDIR)device/fsl/imx8m/optee-packages.mk)
	16	+$(call inherit-product, $(TOPDIR)device/embedian/imx8m/optee-packages.mk)
17	17	$(call inherit-product, $(TOPDIR)$(IMX_DEVICE_PATH)/smarc_mx8mq.mk)
18	18
19	19	TARGET_KERNEL_DEFCONFIG := smarcimx8m_android_defconfig