From f2f0f07cba3ee538b6ef67c11e354b2b03181c0f Mon Sep 17 00:00:00 2001 From: bodapati Date: Mon, 30 Sep 2019 14:41:59 +0530 Subject: [PATCH 01/62] Change cpu-arch to x86 option Tracked-On: OAM-86904 Signed-off-by: bodapati --- caas/mixins.spec | 2 +- celadon_ivi/mixins.spec | 2 +- celadon_tablet/mixins.spec | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/caas/mixins.spec b/caas/mixins.spec index f1f8dfb12..2e89090a1 100755 --- a/caas/mixins.spec +++ b/caas/mixins.spec @@ -18,7 +18,7 @@ acpio-partition: true(partition_size=2) config-partition: true display-density: medium dalvik-heap: tablet-10in-xhdpi-2048 -cpu-arch: slm +cpu-arch: x86 allow-missing-dependencies: true dexpreopt: true pstore: false diff --git a/celadon_ivi/mixins.spec b/celadon_ivi/mixins.spec index 7009bb5c5..89763eb8e 100755 --- a/celadon_ivi/mixins.spec +++ b/celadon_ivi/mixins.spec @@ -18,7 +18,7 @@ acpio-partition: true(partition_size=2) config-partition: true display-density: medium dalvik-heap: tablet-10in-xhdpi-2048 -cpu-arch: slm +cpu-arch: x86 allow-missing-dependencies: true dexpreopt: true pstore: ram_dummy(address=0x50000000,size=0x400000,record_size=0x4000,console_size=0x200000,ftrace_size=0x2000,dump_oops=1) diff --git a/celadon_tablet/mixins.spec b/celadon_tablet/mixins.spec index 2f41169a2..7616a2740 100755 --- a/celadon_tablet/mixins.spec +++ b/celadon_tablet/mixins.spec @@ -18,7 +18,7 @@ acpio-partition: true(partition_size=2) config-partition: true display-density: medium dalvik-heap: tablet-10in-xhdpi-2048 -cpu-arch: slm +cpu-arch: x86 allow-missing-dependencies: true dexpreopt: true pstore: ram_dummy(address=0x50000000,size=0x400000,record_size=0x4000,console_size=0x200000,ftrace_size=0x2000,dump_oops=1) From 6f4ea8acc52eb72744148a4a596e5b3ac9935a2c Mon Sep 17 00:00:00 2001 From: buildslave Date: Mon, 30 Sep 2019 13:38:17 +0000 Subject: [PATCH 02/62] mixin updates Refine x86 options to support more platforms Change cpu-arch to x86 option Tracked-On: OAM-86904 Mixin-Reviewed-On: https://github.com/projectceladon/device-androidia-mixins/pull/417 Mixin-Reviewed-On: https://github.com/projectceladon/device-androidia/pull/591 Signed-off-by: bodapati --- caas/BoardConfig.mk | 20 ++++++++++---------- celadon_ivi/BoardConfig.mk | 20 ++++++++++---------- celadon_tablet/BoardConfig.mk | 20 ++++++++++---------- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/caas/BoardConfig.mk b/caas/BoardConfig.mk index 140d8ca78..318233aec 100644 --- a/caas/BoardConfig.mk +++ b/caas/BoardConfig.mk @@ -391,29 +391,29 @@ BOARD_CONFIGIMAGE_PARTITION_SIZE := 8388608 BOARD_SEPOLICY_M4DEFS += module_config_partition=true BOARD_SEPOLICY_DIRS += $(INTEL_PATH_SEPOLICY)/config-partition ############################################################## -# Source: device/intel/mixins/groups/cpu-arch/slm/BoardConfig.mk.1 +# Source: device/intel/mixins/groups/cpu-arch/x86/BoardConfig.mk ############################################################## +BUILD_CPU_ARCH ?= silvermont + +# Items that are common between slm 32b and 64b: +TARGET_CPU_ABI_LIST_32_BIT := x86 +TARGET_ARCH_VARIANT := $(if $(BUILD_CPU_ARCH),$(BUILD_CPU_ARCH),x86) +TARGET_CPU_SMP := true + ifeq ($(BOARD_USE_64BIT_USERSPACE),true) # 64b-specific items: TARGET_ARCH := x86_64 TARGET_CPU_ABI := x86_64 TARGET_2ND_CPU_ABI := x86 TARGET_2ND_ARCH := x86 -TARGET_2ND_ARCH_VARIANT := silvermont -TARGET_2ND_CPU_VARIANT := silvermont +TARGET_2ND_ARCH_VARIANT := $(if $(BUILD_CPU_ARCH),$(BUILD_CPU_ARCH)) +TARGET_2ND_CPU_VARIANT := $(if $(BUILD_CPU_ARCH),$(BUILD_CPU_ARCH)) else # 32b-specific items: TARGET_ARCH := x86 TARGET_CPU_ABI := x86 endif ############################################################## -# Source: device/intel/mixins/groups/cpu-arch/slm/BoardConfig.mk -############################################################## -# Items that are common between slm 32b and 64b: -TARGET_CPU_ABI_LIST_32_BIT := x86 -TARGET_ARCH_VARIANT := silvermont -TARGET_CPU_SMP := true -############################################################## # Source: device/intel/mixins/groups/allow-missing-dependencies/true/BoardConfig.mk ############################################################## ALLOW_MISSING_DEPENDENCIES := true diff --git a/celadon_ivi/BoardConfig.mk b/celadon_ivi/BoardConfig.mk index b8d8e7d4d..56478a4ba 100644 --- a/celadon_ivi/BoardConfig.mk +++ b/celadon_ivi/BoardConfig.mk @@ -394,29 +394,29 @@ BOARD_CONFIGIMAGE_PARTITION_SIZE := 8388608 BOARD_SEPOLICY_M4DEFS += module_config_partition=true BOARD_SEPOLICY_DIRS += $(INTEL_PATH_SEPOLICY)/config-partition ############################################################## -# Source: device/intel/mixins/groups/cpu-arch/slm/BoardConfig.mk.1 +# Source: device/intel/mixins/groups/cpu-arch/x86/BoardConfig.mk ############################################################## +BUILD_CPU_ARCH ?= silvermont + +# Items that are common between slm 32b and 64b: +TARGET_CPU_ABI_LIST_32_BIT := x86 +TARGET_ARCH_VARIANT := $(if $(BUILD_CPU_ARCH),$(BUILD_CPU_ARCH),x86) +TARGET_CPU_SMP := true + ifeq ($(BOARD_USE_64BIT_USERSPACE),true) # 64b-specific items: TARGET_ARCH := x86_64 TARGET_CPU_ABI := x86_64 TARGET_2ND_CPU_ABI := x86 TARGET_2ND_ARCH := x86 -TARGET_2ND_ARCH_VARIANT := silvermont -TARGET_2ND_CPU_VARIANT := silvermont +TARGET_2ND_ARCH_VARIANT := $(if $(BUILD_CPU_ARCH),$(BUILD_CPU_ARCH)) +TARGET_2ND_CPU_VARIANT := $(if $(BUILD_CPU_ARCH),$(BUILD_CPU_ARCH)) else # 32b-specific items: TARGET_ARCH := x86 TARGET_CPU_ABI := x86 endif ############################################################## -# Source: device/intel/mixins/groups/cpu-arch/slm/BoardConfig.mk -############################################################## -# Items that are common between slm 32b and 64b: -TARGET_CPU_ABI_LIST_32_BIT := x86 -TARGET_ARCH_VARIANT := silvermont -TARGET_CPU_SMP := true -############################################################## # Source: device/intel/mixins/groups/allow-missing-dependencies/true/BoardConfig.mk ############################################################## ALLOW_MISSING_DEPENDENCIES := true diff --git a/celadon_tablet/BoardConfig.mk b/celadon_tablet/BoardConfig.mk index ef4d69d29..130091655 100644 --- a/celadon_tablet/BoardConfig.mk +++ b/celadon_tablet/BoardConfig.mk @@ -390,29 +390,29 @@ BOARD_CONFIGIMAGE_PARTITION_SIZE := 8388608 BOARD_SEPOLICY_M4DEFS += module_config_partition=true BOARD_SEPOLICY_DIRS += $(INTEL_PATH_SEPOLICY)/config-partition ############################################################## -# Source: device/intel/mixins/groups/cpu-arch/slm/BoardConfig.mk.1 +# Source: device/intel/mixins/groups/cpu-arch/x86/BoardConfig.mk ############################################################## +BUILD_CPU_ARCH ?= silvermont + +# Items that are common between slm 32b and 64b: +TARGET_CPU_ABI_LIST_32_BIT := x86 +TARGET_ARCH_VARIANT := $(if $(BUILD_CPU_ARCH),$(BUILD_CPU_ARCH),x86) +TARGET_CPU_SMP := true + ifeq ($(BOARD_USE_64BIT_USERSPACE),true) # 64b-specific items: TARGET_ARCH := x86_64 TARGET_CPU_ABI := x86_64 TARGET_2ND_CPU_ABI := x86 TARGET_2ND_ARCH := x86 -TARGET_2ND_ARCH_VARIANT := silvermont -TARGET_2ND_CPU_VARIANT := silvermont +TARGET_2ND_ARCH_VARIANT := $(if $(BUILD_CPU_ARCH),$(BUILD_CPU_ARCH)) +TARGET_2ND_CPU_VARIANT := $(if $(BUILD_CPU_ARCH),$(BUILD_CPU_ARCH)) else # 32b-specific items: TARGET_ARCH := x86 TARGET_CPU_ABI := x86 endif ############################################################## -# Source: device/intel/mixins/groups/cpu-arch/slm/BoardConfig.mk -############################################################## -# Items that are common between slm 32b and 64b: -TARGET_CPU_ABI_LIST_32_BIT := x86 -TARGET_ARCH_VARIANT := silvermont -TARGET_CPU_SMP := true -############################################################## # Source: device/intel/mixins/groups/allow-missing-dependencies/true/BoardConfig.mk ############################################################## ALLOW_MISSING_DEPENDENCIES := true From c2bc6171197498d7ac680bee198347b44994d085 Mon Sep 17 00:00:00 2001 From: buildslave Date: Wed, 9 Oct 2019 07:47:14 +0000 Subject: [PATCH 03/62] mixin updates [postinstall] Fix "fails to run postinstall" issue 1. Sepolicy path of postinstall was changed, modify BOARD_SEPOLICY_DIRS to point to right path. 2. Use system/bin/sh to replace vendor/bin/sh Android Q add support using system/bin/sh in recovery mode Tracked-On: OAM-86848 Mixin-Reviewed-On: https://github.com/projectceladon/device-androidia-mixins/pull/412 Signed-off-by: Heng Luo --- caas/BoardConfig.mk | 4 ++-- caas/extra_files/boot-arch/update_ifwi_ab.sh | 2 +- celadon_ivi/BoardConfig.mk | 4 ++-- celadon_ivi/extra_files/boot-arch/update_ifwi_ab.sh | 2 +- celadon_tablet/BoardConfig.mk | 4 ++-- celadon_tablet/extra_files/boot-arch/update_ifwi_ab.sh | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/caas/BoardConfig.mk b/caas/BoardConfig.mk index 318233aec..0ef4ea182 100644 --- a/caas/BoardConfig.mk +++ b/caas/BoardConfig.mk @@ -121,8 +121,8 @@ BOARD_FLASHFILES += $(PRODUCT_OUT)/bootloader.img BOARD_SEPOLICY_DIRS += $(INTEL_PATH_SEPOLICY)/boot-arch/generic -BOARD_SEPOLICY_DIRS += $(INTEL_PATH_SEPOLICY)/boot-arch/slotab_ota/generic -BOARD_SEPOLICY_DIRS += $(INTEL_PATH_SEPOLICY)/boot-arch/slotab_ota/efi +BOARD_SEPOLICY_DIRS += $(INTEL_PATH_SEPOLICY)/abota/generic +BOARD_SEPOLICY_DIRS += $(INTEL_PATH_SEPOLICY)/abota/efi KERNELFLINGER_USE_RPMB_SIMULATE := true diff --git a/caas/extra_files/boot-arch/update_ifwi_ab.sh b/caas/extra_files/boot-arch/update_ifwi_ab.sh index 3cadb9f0c..6bc8c9bbf 100644 --- a/caas/extra_files/boot-arch/update_ifwi_ab.sh +++ b/caas/extra_files/boot-arch/update_ifwi_ab.sh @@ -1,4 +1,4 @@ -#!/vendor/bin/sh +#!/system/bin/sh # userdata checkpoint cleanup at postinstall step USERDATA_CHECKPOINT_GC=vendor/bin/checkpoint_gc diff --git a/celadon_ivi/BoardConfig.mk b/celadon_ivi/BoardConfig.mk index 56478a4ba..a3579c696 100644 --- a/celadon_ivi/BoardConfig.mk +++ b/celadon_ivi/BoardConfig.mk @@ -123,8 +123,8 @@ BOARD_FLASHFILES += $(PRODUCT_OUT)/bootloader.img BOARD_SEPOLICY_DIRS += $(INTEL_PATH_SEPOLICY)/boot-arch/generic -BOARD_SEPOLICY_DIRS += $(INTEL_PATH_SEPOLICY)/boot-arch/slotab_ota/generic -BOARD_SEPOLICY_DIRS += $(INTEL_PATH_SEPOLICY)/boot-arch/slotab_ota/efi +BOARD_SEPOLICY_DIRS += $(INTEL_PATH_SEPOLICY)/abota/generic +BOARD_SEPOLICY_DIRS += $(INTEL_PATH_SEPOLICY)/abota/efi KERNELFLINGER_USE_RPMB_SIMULATE := true diff --git a/celadon_ivi/extra_files/boot-arch/update_ifwi_ab.sh b/celadon_ivi/extra_files/boot-arch/update_ifwi_ab.sh index 3cadb9f0c..6bc8c9bbf 100644 --- a/celadon_ivi/extra_files/boot-arch/update_ifwi_ab.sh +++ b/celadon_ivi/extra_files/boot-arch/update_ifwi_ab.sh @@ -1,4 +1,4 @@ -#!/vendor/bin/sh +#!/system/bin/sh # userdata checkpoint cleanup at postinstall step USERDATA_CHECKPOINT_GC=vendor/bin/checkpoint_gc diff --git a/celadon_tablet/BoardConfig.mk b/celadon_tablet/BoardConfig.mk index 130091655..17d00da20 100644 --- a/celadon_tablet/BoardConfig.mk +++ b/celadon_tablet/BoardConfig.mk @@ -126,8 +126,8 @@ endif BOARD_SEPOLICY_DIRS += $(INTEL_PATH_SEPOLICY)/boot-arch/generic -BOARD_SEPOLICY_DIRS += $(INTEL_PATH_SEPOLICY)/boot-arch/slotab_ota/generic -BOARD_SEPOLICY_DIRS += $(INTEL_PATH_SEPOLICY)/boot-arch/slotab_ota/efi +BOARD_SEPOLICY_DIRS += $(INTEL_PATH_SEPOLICY)/abota/generic +BOARD_SEPOLICY_DIRS += $(INTEL_PATH_SEPOLICY)/abota/efi KERNELFLINGER_USE_RPMB_SIMULATE := true diff --git a/celadon_tablet/extra_files/boot-arch/update_ifwi_ab.sh b/celadon_tablet/extra_files/boot-arch/update_ifwi_ab.sh index 3cadb9f0c..6bc8c9bbf 100644 --- a/celadon_tablet/extra_files/boot-arch/update_ifwi_ab.sh +++ b/celadon_tablet/extra_files/boot-arch/update_ifwi_ab.sh @@ -1,4 +1,4 @@ -#!/vendor/bin/sh +#!/system/bin/sh # userdata checkpoint cleanup at postinstall step USERDATA_CHECKPOINT_GC=vendor/bin/checkpoint_gc From 404a6ce1ea9342a54debe610fa0261d277c511d2 Mon Sep 17 00:00:00 2001 From: buildslave Date: Thu, 10 Oct 2019 02:11:26 +0000 Subject: [PATCH 04/62] mixin updates Set overlay for disabling keepalive offload to address CTS issue Keepalive packet offloading is enabled by default. CTS test cases are failing as the keepalive offloading event is not received. As keepalive offloading is not supported, override the configs to disable it to address CTS failures. Tracked-On: OAM-86930 Mixin-Reviewed-On: https://github.com/projectceladon/device-androidia-mixins/pull/418 Signed-off-by: Aiswarya Cyriac --- caas/device.mk | 2 ++ celadon_ivi/device.mk | 2 ++ celadon_tablet/device.mk | 2 ++ 3 files changed, 6 insertions(+) diff --git a/caas/device.mk b/caas/device.mk index d308684fb..90365710c 100644 --- a/caas/device.mk +++ b/caas/device.mk @@ -117,6 +117,8 @@ PRODUCT_COPY_FILES += \ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ ro.wifi.softap_dualband_allow=false + +PRODUCT_PACKAGE_OVERLAYS += $(INTEL_PATH_COMMON)/wlan/overlay-disable_keepalive_offload ############################################################## # Source: device/intel/mixins/groups/kernel/gmin64/product.mk.1 ############################################################## diff --git a/celadon_ivi/device.mk b/celadon_ivi/device.mk index 649965b36..19fa686ab 100644 --- a/celadon_ivi/device.mk +++ b/celadon_ivi/device.mk @@ -117,6 +117,8 @@ PRODUCT_COPY_FILES += \ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ ro.wifi.softap_dualband_allow=false + +PRODUCT_PACKAGE_OVERLAYS += $(INTEL_PATH_COMMON)/wlan/overlay-disable_keepalive_offload ############################################################## # Source: device/intel/mixins/groups/kernel/gmin64/product.mk.1 ############################################################## diff --git a/celadon_tablet/device.mk b/celadon_tablet/device.mk index 10846b1b6..ccb4d4ee3 100644 --- a/celadon_tablet/device.mk +++ b/celadon_tablet/device.mk @@ -151,6 +151,8 @@ PRODUCT_COPY_FILES += \ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ ro.wifi.softap_dualband_allow=false + +PRODUCT_PACKAGE_OVERLAYS += $(INTEL_PATH_COMMON)/wlan/overlay-disable_keepalive_offload ############################################################## # Source: device/intel/mixins/groups/kernel/gmin64/product.mk.1 ############################################################## From 1aa75779d68f25137062a3b1b99f853180511d0e Mon Sep 17 00:00:00 2001 From: sunxunou Date: Mon, 23 Sep 2019 15:27:28 +0800 Subject: [PATCH 05/62] Add boot-arch groups for cic Tracked-On: OAM-86757 Signed-off-by: sunxunou --- cic/mixins.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/cic/mixins.spec b/cic/mixins.spec index f48666e8e..8f36419d9 100644 --- a/cic/mixins.spec +++ b/cic/mixins.spec @@ -7,6 +7,7 @@ mixinsrel: false product.mk: device.mk [groups] +boot-arch: project-celadon(uefi_arch=x86_64,rpmb_simulate=true,use_cic=true) allow-missing-dependencies: true audio: aic cpu-arch: x86_64 From 43110b9c38fb7309b3fa82fd608e6c6ff7279526 Mon Sep 17 00:00:00 2001 From: buildslave Date: Fri, 11 Oct 2019 03:51:14 +0000 Subject: [PATCH 06/62] mixin updates Support kernelflinger-for-cic.efi build for cic Add boot-arch groups for cic Tracked-On: OAM-86757 Mixin-Reviewed-On: https://github.com/projectceladon/device-androidia-mixins/pull/402 Mixin-Reviewed-On: https://github.com/projectceladon/device-androidia/pull/570 Signed-off-by: sunxunou --- caas/device.mk | 8 ++- celadon_ivi/device.mk | 8 ++- celadon_tablet/device.mk | 8 ++- cic/AndroidBoard.mk | 58 ++++++++++++------ cic/BoardConfig.mk | 45 ++++++++------ cic/device.mk | 9 +++ cic/extra_files/boot-arch/startup.nsh | 7 +++ cic/extra_files/boot-arch/update_ifwi_ab.sh | 68 +++++++++++++++++++++ cic/flashfiles.ini | 4 ++ cic/fstab | 4 ++ cic/fstab.recovery | 4 ++ cic/gpt.ini | 3 + cic/init.rc | 34 +++++++++++ cic/init.recovery.rc | 3 + 14 files changed, 216 insertions(+), 47 deletions(-) create mode 100644 cic/extra_files/boot-arch/startup.nsh create mode 100644 cic/extra_files/boot-arch/update_ifwi_ab.sh diff --git a/caas/device.mk b/caas/device.mk index 90365710c..a4e092fee 100644 --- a/caas/device.mk +++ b/caas/device.mk @@ -45,6 +45,11 @@ PRODUCT_COPY_FILES += $(LOCAL_PATH)/extra_files/slot-ab/postinstall.sh:recovery/ # Source: device/intel/mixins/groups/boot-arch/project-celadon/product.mk ############################################################## TARGET_UEFI_ARCH := x86_64 + +# Android Kernelflinger uses the OpenSSL library to support the +# bootloader policy +KERNELFLINGER_SSL_LIBRARY := openssl + BIOS_VARIANT := release @@ -64,9 +69,6 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ # Allow Kernelflinger to ignore the RSCI reset source "not_applicable" # when setting the bootreason KERNELFLINGER_IGNORE_NOT_APPLICABLE_RESET := true -# Android Kernelflinger uses the OpenSSL library to support the -# bootloader policy -KERNELFLINGER_SSL_LIBRARY := openssl KERNELFLINGER_SUPPORT_SELF_USB_DEVICE_MODE_PROTOCOL := true diff --git a/celadon_ivi/device.mk b/celadon_ivi/device.mk index 19fa686ab..829f6e3d9 100644 --- a/celadon_ivi/device.mk +++ b/celadon_ivi/device.mk @@ -45,6 +45,11 @@ PRODUCT_COPY_FILES += $(LOCAL_PATH)/extra_files/slot-ab/postinstall.sh:recovery/ # Source: device/intel/mixins/groups/boot-arch/project-celadon/product.mk ############################################################## TARGET_UEFI_ARCH := x86_64 + +# Android Kernelflinger uses the OpenSSL library to support the +# bootloader policy +KERNELFLINGER_SSL_LIBRARY := openssl + BIOS_VARIANT := release @@ -64,9 +69,6 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ # Allow Kernelflinger to ignore the RSCI reset source "not_applicable" # when setting the bootreason KERNELFLINGER_IGNORE_NOT_APPLICABLE_RESET := true -# Android Kernelflinger uses the OpenSSL library to support the -# bootloader policy -KERNELFLINGER_SSL_LIBRARY := openssl KERNELFLINGER_SUPPORT_SELF_USB_DEVICE_MODE_PROTOCOL := true diff --git a/celadon_tablet/device.mk b/celadon_tablet/device.mk index ccb4d4ee3..2ae43ae8f 100644 --- a/celadon_tablet/device.mk +++ b/celadon_tablet/device.mk @@ -45,6 +45,11 @@ PRODUCT_COPY_FILES += $(LOCAL_PATH)/extra_files/slot-ab/postinstall.sh:recovery/ # Source: device/intel/mixins/groups/boot-arch/project-celadon/product.mk ############################################################## TARGET_UEFI_ARCH := x86_64 + +# Android Kernelflinger uses the OpenSSL library to support the +# bootloader policy +KERNELFLINGER_SSL_LIBRARY := openssl + BIOS_VARIANT := release @@ -98,9 +103,6 @@ endif # Allow Kernelflinger to ignore the RSCI reset source "not_applicable" # when setting the bootreason KERNELFLINGER_IGNORE_NOT_APPLICABLE_RESET := true -# Android Kernelflinger uses the OpenSSL library to support the -# bootloader policy -KERNELFLINGER_SSL_LIBRARY := openssl KERNELFLINGER_SUPPORT_SELF_USB_DEVICE_MODE_PROTOCOL := true diff --git a/cic/AndroidBoard.mk b/cic/AndroidBoard.mk index a8a3a2fc3..9044b5067 100644 --- a/cic/AndroidBoard.mk +++ b/cic/AndroidBoard.mk @@ -1,10 +1,46 @@ # ----------------- BEGIN MIX-IN DEFINITIONS ----------------- # Mix-In definitions are auto-generated by mixin-update +############################################################## +# Source: device/intel/mixins/groups/variants/default/AndroidBoard.mk +############################################################## +# flashfile_add_blob +# - Delete ::variant:: from +# - If the result does not exists and is set, error +# - If is set, put the result in +# - Add the pair : in BOARD_FLASHFILES_FIRMWARE +define flashfile_add_blob +$(eval blob := $(subst ::variant::,,$(2))) \ +$(if $(wildcard $(blob)), \ + $(if $(4), $(eval $(4) := $(blob))) \ + $(eval BOARD_FLASHFILES_FIRMWARE += $(blob):$(1)) \ + , \ + $(if $(3), $(error $(blob) does not exist))) +endef + +############################################################## +# Source: device/intel/mixins/groups/boot-arch/project-celadon/AndroidBoard.mk.1 +############################################################## +############################################################## +# Source: device/intel/mixins/groups/boot-arch/project-celadon/AndroidBoard.mk +############################################################## +# Rules to create bootloader zip file, a precursor to the bootloader +# image that is stored in the target-files-package. There's also +# metadata file which indicates how large to make the VFAT filesystem +# image + +ifeq ($(TARGET_UEFI_ARCH),i386) +efi_default_name := bootia32.efi +LOADER_TYPE := linux-x86 +else +efi_default_name := bootx64.efi +LOADER_TYPE := linux-x86_64 +endif + ############################################################## # Source: device/intel/mixins/groups/device-specific/cic/AndroidBoard.mk ############################################################## .PHONY: multidroid -multidroid: droid +multidroid: droid kf4cic-$(TARGET_BUILD_VARIANT) @echo Make multidroid image... $(hide) rm -rf $(PRODUCT_OUT)/docker $(hide) mkdir -p $(PRODUCT_OUT)/docker/android/root @@ -19,6 +55,7 @@ multidroid: droid $(hide) cp -r $(PRODUCT_OUT)/root/* $(PRODUCT_OUT)/docker/android/root $(hide) rm -f $(PRODUCT_OUT)/docker/android/root/etc $(hide) cp -r $(PRODUCT_OUT)/system/etc $(PRODUCT_OUT)/docker/android/root + $(hide) cp -r $(PRODUCT_OUT)/efi/kf4cic.efi $(PRODUCT_OUT)/kf4cic.efi $(hide) chmod -R g-w $(PRODUCT_OUT)/docker/android/root TARGET_AIC_FILE_NAME := $(TARGET_PRODUCT)-aic-$(BUILD_NUMBER_FROM_FILE).tar.gz @@ -28,27 +65,10 @@ aic: .KATI_NINJA_POOL := console aic: multidroid @echo Make AIC docker images... $(HOST_OUT_EXECUTABLES)/aic-build -b $(BUILD_NUMBER_FROM_FILE) - tar cvzf $(PRODUCT_OUT)/$(TARGET_AIC_FILE_NAME) -C $(PRODUCT_OUT) aic android.tar.gz aic-manager.tar.gz -C docker update + tar cvzf $(PRODUCT_OUT)/$(TARGET_AIC_FILE_NAME) -C $(PRODUCT_OUT) aic android.tar.gz aic-manager.tar.gz kf4cic.efi -C docker update .PHONY: cic cic: aic -############################################################## -# Source: device/intel/mixins/groups/variants/default/AndroidBoard.mk -############################################################## -# flashfile_add_blob -# - Delete ::variant:: from -# - If the result does not exists and is set, error -# - If is set, put the result in -# - Add the pair : in BOARD_FLASHFILES_FIRMWARE -define flashfile_add_blob -$(eval blob := $(subst ::variant::,,$(2))) \ -$(if $(wildcard $(blob)), \ - $(if $(4), $(eval $(4) := $(blob))) \ - $(eval BOARD_FLASHFILES_FIRMWARE += $(blob):$(1)) \ - , \ - $(if $(3), $(error $(blob) does not exist))) -endef - ############################################################## # Source: device/intel/mixins/groups/vndk/default/AndroidBoard.mk ############################################################## diff --git a/cic/BoardConfig.mk b/cic/BoardConfig.mk index 9642425dd..517e8dca5 100644 --- a/cic/BoardConfig.mk +++ b/cic/BoardConfig.mk @@ -1,5 +1,31 @@ # ----------------- BEGIN MIX-IN DEFINITIONS ----------------- # Mix-In definitions are auto-generated by mixin-update +############################################################## +# Source: device/intel/mixins/groups/slot-ab/default/BoardConfig.mk +############################################################## +ifeq (project-celadon,efi) +# Adds edify commands swap_entries and copy_partition for robust +# update of the EFI system partition +TARGET_RECOVERY_UPDATER_LIBS := libupdater_esp +# Extra libraries needed to be rolled into recovery updater +# libgpt_static and libefivar are needed by libupdater_esp +TARGET_RECOVERY_UPDATER_EXTRA_LIBS := libcommon_recovery libgpt_static +ifeq ($(TARGET_SUPPORT_BOOT_OPTION),true) +TARGET_RECOVERY_UPDATER_EXTRA_LIBS += libefivar +endif +endif + + +BOARD_RECOVERYIMAGE_PARTITION_SIZE ?= 31457280 +BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4 +BOARD_CACHEIMAGE_PARTITION_SIZE ?= 104857600 +############################################################## +# Source: device/intel/mixins/groups/boot-arch/project-celadon/BoardConfig.mk +############################################################## + + +KERNELFLINGER_USE_RPMB_SIMULATE := true + ############################################################## # Source: device/intel/mixins/groups/allow-missing-dependencies/true/BoardConfig.mk ############################################################## @@ -112,23 +138,4 @@ WPA_SUPPLICANT_VERSION := VER_0_8_X WIFI_DRIVER_FW_PATH_PARAM := "/dev/null" WIFI_DRIVER_FW_PATH_STA := "/dev/null" WIFI_DRIVER_FW_PATH_AP := "/dev/null" -############################################################## -# Source: device/intel/mixins/groups/slot-ab/default/BoardConfig.mk -############################################################## -ifeq (False,efi) -# Adds edify commands swap_entries and copy_partition for robust -# update of the EFI system partition -TARGET_RECOVERY_UPDATER_LIBS := libupdater_esp -# Extra libraries needed to be rolled into recovery updater -# libgpt_static and libefivar are needed by libupdater_esp -TARGET_RECOVERY_UPDATER_EXTRA_LIBS := libcommon_recovery libgpt_static -ifeq ($(TARGET_SUPPORT_BOOT_OPTION),true) -TARGET_RECOVERY_UPDATER_EXTRA_LIBS += libefivar -endif -endif - - -BOARD_RECOVERYIMAGE_PARTITION_SIZE ?= 31457280 -BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4 -BOARD_CACHEIMAGE_PARTITION_SIZE ?= 104857600 # ------------------ END MIX-IN DEFINITIONS ------------------ diff --git a/cic/device.mk b/cic/device.mk index 2c5b68206..b794e68cb 100644 --- a/cic/device.mk +++ b/cic/device.mk @@ -1,5 +1,14 @@ # ----------------- BEGIN MIX-IN DEFINITIONS ----------------- # Mix-In definitions are auto-generated by mixin-update +############################################################## +# Source: device/intel/mixins/groups/boot-arch/project-celadon/product.mk +############################################################## +TARGET_UEFI_ARCH := x86_64 + +# Android Kernelflinger uses the OpenSSL library to support the +# bootloader policy +KERNELFLINGER_SSL_LIBRARY := openssl + ############################################################## # Source: device/intel/mixins/groups/audio/aic/product.mk ############################################################## diff --git a/cic/extra_files/boot-arch/startup.nsh b/cic/extra_files/boot-arch/startup.nsh new file mode 100644 index 000000000..abab6587e --- /dev/null +++ b/cic/extra_files/boot-arch/startup.nsh @@ -0,0 +1,7 @@ +# ----------------- BEGIN MIX-IN DEFINITIONS ----------------- +# Mix-In definitions are auto-generated by mixin-update +############################################################## +# Source: device/intel/mixins/groups/boot-arch/project-celadon/startup.nsh +############################################################## +installer --batch installer.cmd +# ------------------ END MIX-IN DEFINITIONS ------------------ diff --git a/cic/extra_files/boot-arch/update_ifwi_ab.sh b/cic/extra_files/boot-arch/update_ifwi_ab.sh new file mode 100644 index 000000000..6bc8c9bbf --- /dev/null +++ b/cic/extra_files/boot-arch/update_ifwi_ab.sh @@ -0,0 +1,68 @@ +#!/system/bin/sh + +# userdata checkpoint cleanup at postinstall step +USERDATA_CHECKPOINT_GC=vendor/bin/checkpoint_gc +if [ -f ${USERDATA_CHECKPOINT_GC} ]; then + source ${USERDATA_CHECKPOINT_GC} +fi + +KFLD_UPDATE_FILE="/postinstall/firmware/kfld.efi" +KF_UPDATE_FILE="/postinstall/firmware/kernelflinger.efi" +BIOS_UPDATE_FILE="/postinstall/firmware/BIOSUPDATE.fv" +DEV_PATH_KFLD="/dev/block/by-name/esp" +DEV_PATH="/dev/block/by-name/bootloader" +MOUNT_POINT="/bootloader" +KFLD_DESTINATION_FILE="/bootloader/EFI/INTEL/KFLD_NEW.EFI" +KF_DESTINATION_FILE="/bootloader/EFI/BOOT/kernelflinger_new.efi" +BIOS_UPDATE_DESTINATION_FILE="/bootloader/BIOSUPDATE.fv" +is_exist_efi=0 +is_exist_bios=0 + +EFI_UPDATE_FILE=${KF_UPDATE_FILE} +EFI_DESTINATION_FILE=${KF_DESTINATION_FILE} +# -f is check for regular files, not for symlinks +# so use -e which is more permissive to check if path exist +if [ -e ${DEV_PATH_KFLD} ]; then + EFI_UPDATE_FILE=${KFLD_UPDATE_FILE} + EFI_DESTINATION_FILE=${KFLD_DESTINATION_FILE} + DEV_PATH=${DEV_PATH_KFLD} +fi + +if [ -f ${EFI_UPDATE_FILE} ]; then + is_exist_efi=1 +fi +if [ -f ${BIOS_UPDATE_FILE} ]; then + is_exist_bios=1 +fi + +if [[ $is_exist_efi -eq 0 && $is_exist_efi -eq 0 ]]; then + echo "No file to be copied." + exit -1 +fi + +mount -t vfat $DEV_PATH $MOUNT_POINT +if [ $? != 0 ]; then + echo "Cannot mount $MOUNT_POINT" + exit -2; +fi + +if [ $is_exist_efi -eq 1 ]; then + cp $EFI_UPDATE_FILE $EFI_DESTINATION_FILE + if [ $? != 0 ]; then + echo "Cannot copy $EFI_UPDATE_FILE" + exit -3; + fi +fi + +if [ $is_exist_bios -eq 1 ]; then + cp $BIOS_UPDATE_FILE $BIOS_UPDATE_DESTINATION_FILE + if [ $? != 0 ]; then + echo "Cannot copy $BIOS_UPDATE_FILE" + exit -4; + fi +fi + +umount $MOUNT_POINT + +echo "EFI copy OK" +exit 0 diff --git a/cic/flashfiles.ini b/cic/flashfiles.ini index d2d302913..7160ddecd 100644 --- a/cic/flashfiles.ini +++ b/cic/flashfiles.ini @@ -1,3 +1,7 @@ # ----------------- BEGIN MIX-IN DEFINITIONS ----------------- # Mix-In definitions are auto-generated by mixin-update +############################################################## +# Source: device/intel/mixins/groups/boot-arch/project-celadon/flashfiles.ini +############################################################## + # ------------------ END MIX-IN DEFINITIONS ------------------ diff --git a/cic/fstab b/cic/fstab index 74ebc1b40..e3a01aa63 100644 --- a/cic/fstab +++ b/cic/fstab @@ -1,5 +1,9 @@ # ----------------- BEGIN MIX-IN DEFINITIONS ----------------- # Mix-In definitions are auto-generated by mixin-update +############################################################## +# Source: device/intel/mixins/groups/boot-arch/project-celadon/fstab +############################################################## + ############################################################## # Source: device/intel/mixins/groups/device-specific/cic/fstab ############################################################## diff --git a/cic/fstab.recovery b/cic/fstab.recovery index d2d302913..4aed64b78 100644 --- a/cic/fstab.recovery +++ b/cic/fstab.recovery @@ -1,3 +1,7 @@ # ----------------- BEGIN MIX-IN DEFINITIONS ----------------- # Mix-In definitions are auto-generated by mixin-update +############################################################## +# Source: device/intel/mixins/groups/boot-arch/project-celadon/fstab.recovery +############################################################## + # ------------------ END MIX-IN DEFINITIONS ------------------ diff --git a/cic/gpt.ini b/cic/gpt.ini index d2d302913..ec9cfc799 100644 --- a/cic/gpt.ini +++ b/cic/gpt.ini @@ -1,3 +1,6 @@ # ----------------- BEGIN MIX-IN DEFINITIONS ----------------- # Mix-In definitions are auto-generated by mixin-update +############################################################## +# Source: device/intel/mixins/groups/boot-arch/project-celadon/gpt.ini +############################################################## # ------------------ END MIX-IN DEFINITIONS ------------------ diff --git a/cic/init.rc b/cic/init.rc index 76d2db54a..44fbc6f9e 100644 --- a/cic/init.rc +++ b/cic/init.rc @@ -1,6 +1,40 @@ # ----------------- BEGIN MIX-IN DEFINITIONS ----------------- # Mix-In definitions are auto-generated by mixin-update ############################################################## +# Source: device/intel/mixins/groups/boot-arch/project-celadon/init.rc +############################################################## +on fs + # ro.boot.hardware = TARGET_PRODUCT (set in kernel command line + # as androidboot.hardware). Mount all the filesystems as specified + # in the fstab. + mount_all /fstab.${ro.hardware} + +service watchdogd /system/bin/watchdogd + user root + class core + oneshot + seclabel u:r:watchdogd:s0 + +on charger + start watchdogd + +on init + # Load persistent dm-verity state and detect if a restart was + # triggered after dm-verity detected a corrupted block + verity_load_state + +on early-boot + chmod 0440 /sys/firmware/dmi/entries/148-0/raw + chmod 0440 /sys/firmware/dmi/entries/0-0/raw + +on fs + # Update dm-verity persistent state and set partition.*.verified + # properties + verity_update_state + +on verity-logging + exec u:r:slideshow:s0 -- /sbin/slideshow -t 30000 -p warning/verity_red_1 warning/verity_red_2 +############################################################## # Source: device/intel/mixins/groups/device-specific/cic/init.rc ############################################################## on early-init diff --git a/cic/init.recovery.rc b/cic/init.recovery.rc index d2d302913..ddd827312 100644 --- a/cic/init.recovery.rc +++ b/cic/init.recovery.rc @@ -1,3 +1,6 @@ # ----------------- BEGIN MIX-IN DEFINITIONS ----------------- # Mix-In definitions are auto-generated by mixin-update +############################################################## +# Source: device/intel/mixins/groups/boot-arch/project-celadon/init.recovery.rc +############################################################## # ------------------ END MIX-IN DEFINITIONS ------------------ From 59d95d00093623dea4606d410b07aefd3794b1c4 Mon Sep 17 00:00:00 2001 From: buildslave Date: Fri, 11 Oct 2019 12:59:43 +0000 Subject: [PATCH 07/62] mixin updates Rename build result file as CI convention. We have certain logic in our CI process that depends on this naming convention for the build result: lunchtargetname-buildnumber Otherwise, it will break the CI process. Tracked-On: OAM-88183 Mixin-Reviewed-On: https://github.com/projectceladon/device-androidia-mixins/pull/423 Signed-off-by: zhongjie --- cic/AndroidBoard.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cic/AndroidBoard.mk b/cic/AndroidBoard.mk index 9044b5067..330de24c6 100644 --- a/cic/AndroidBoard.mk +++ b/cic/AndroidBoard.mk @@ -58,7 +58,7 @@ multidroid: droid kf4cic-$(TARGET_BUILD_VARIANT) $(hide) cp -r $(PRODUCT_OUT)/efi/kf4cic.efi $(PRODUCT_OUT)/kf4cic.efi $(hide) chmod -R g-w $(PRODUCT_OUT)/docker/android/root -TARGET_AIC_FILE_NAME := $(TARGET_PRODUCT)-aic-$(BUILD_NUMBER_FROM_FILE).tar.gz +TARGET_AIC_FILE_NAME := $(TARGET_PRODUCT)-$(BUILD_NUMBER_FROM_FILE).tar.gz .PHONY: aic aic: .KATI_NINJA_POOL := console From 0e8d094b959b87abd5187d025ea89487111983df Mon Sep 17 00:00:00 2001 From: buildslave Date: Sat, 12 Oct 2019 05:19:23 +0000 Subject: [PATCH 08/62] mixin updates Simplify the preparation work of setting VM 1. install UEFI from package source. 2. use emulational USB to optimize the flash process. 3. automatize flash process, user could flash without operations in UEFI. Tracked-On: OAM-88180 Mixin-Reviewed-On: https://github.com/projectceladon/device-androidia-mixins/pull/425 Signed-off-by: Liu, Xinwu --- caas/setup_host.sh | 37 ++++--------------------------------- caas/start_android_qcow2.sh | 6 ++++-- caas/start_flash_usb.sh | 22 ++++++++++++++++++++-- 3 files changed, 28 insertions(+), 37 deletions(-) diff --git a/caas/setup_host.sh b/caas/setup_host.sh index 1c3d2d052..8d2b9f0ce 100755 --- a/caas/setup_host.sh +++ b/caas/setup_host.sh @@ -9,6 +9,7 @@ function ubu_changes_require(){ if [ x$res = xn ]; then exit 0 fi + apt install -y wget mtools ovmf } function ubu_install_qemu(){ @@ -46,26 +47,14 @@ function ubu_enable_host_gvtg(){ } function check_network(){ - wget --timeout=3 --tries=1 https://download.qemu.org/ -q -O /dev/null + wget --timeout=3 --tries=1 https://github.com/projectceladon/ -q -O /dev/null if [ $? -ne 0 ]; then - echo "access https://download.qemu.org/ failed!" + echo "access https://github.com/projectceladon/ failed!" echo "please make sure network is working" exit -1 fi } -function ubu_build_bios(){ - apt install -y build-essential git uuid-dev iasl nasm git iasl - wget https://github.com/tianocore/edk2/archive/edk2-stable201808.tar.gz - tar zxvf edk2-stable201808.tar.gz - cd edk2-edk2-stable201808/ - source ./edksetup.sh - make -C BaseTools/ - build -a X64 -t GCC48 -p OvmfPkg/OvmfPkgX64.dsc - find . -name OVMF.fd -exec cp {} .. \; - cd .. -} - function ask_reboot(){ if [ $reboot_required -eq 1 ];then read -p "Reboot is required, do you want to reboot it NOW? [y/N]" res @@ -94,10 +83,7 @@ function check_kernel(){ function clr_changes_require(){ echo "Please make sure your bundle is working" echo "If you run the installation first time, reboot is required" -} - -function clr_install_qemu(){ - swupd bundle-add kvm-host + swupd bundle-add wget storage-utils kvm-host } function clr_enable_host_gvtg(){ @@ -108,18 +94,6 @@ function clr_enable_host_gvtg(){ && reboot_required=1 } -function clr_build_bios(){ - swupd bundle-add nasm devpkg-util-linux acpica-unix2 git - wget https://github.com/tianocore/edk2/archive/edk2-stable201808.tar.gz - tar zxvf edk2-stable201808.tar.gz - cd edk2-edk2-stable201808/ - source ./edksetup.sh - make -C BaseTools/ - build -a X64 -t GCC48 -p OvmfPkg/OvmfPkgX64.dsc - find . -name OVMF.fd -exec cp {} .. \; - cd .. -} - function get_required_scripts(){ wget https://raw.githubusercontent.com/projectceladon/device-androidia-mixins/master/groups/device-specific/caas/start_flash_usb.sh wget https://raw.githubusercontent.com/projectceladon/device-androidia-mixins/master/groups/device-specific/caas/start_android_qcow2.sh @@ -133,7 +107,6 @@ if [[ $version =~ "Ubuntu" ]]; then check_network ubu_changes_require ubu_install_qemu - ubu_build_bios ubu_enable_host_gvtg get_required_scripts check_kernel @@ -141,8 +114,6 @@ if [[ $version =~ "Ubuntu" ]]; then elif [[ $version =~ "Clear Linux OS" ]]; then check_network clr_changes_require - clr_install_qemu - clr_build_bios clr_enable_host_gvtg get_required_scripts check_kernel diff --git a/caas/start_android_qcow2.sh b/caas/start_android_qcow2.sh index e2fdb1a95..795831133 100755 --- a/caas/start_android_qcow2.sh +++ b/caas/start_android_qcow2.sh @@ -1,6 +1,8 @@ #!/bin/bash g_file="/sys/bus/pci/devices/0000:00:02.0/4ec1ff92-81d7-11e9-aed4-5bf6a9a2bb0a" +ovmf_file="./OVMF.fd" +[ ! -f $ovmf_file ] && ovmf_file="/usr/share/qemu/OVMF.fd" function setup_vgpu(){ res=0 @@ -27,7 +29,7 @@ function launch_hwrender(){ -device qemu-xhci,id=xhci,addr=0x8 \ -device usb-mouse \ -device usb-kbd \ - -bios ./OVMF.fd \ + -drive file=$ovmf_file,format=raw,if=pflash \ -chardev socket,id=charserial0,path=./kernel-console,server,nowait \ -device isa-serial,chardev=charserial0,id=serial0 \ -device intel-hda -device hda-duplex \ @@ -53,7 +55,7 @@ function launch_swrender(){ -device qemu-xhci,id=xhci,addr=0x8 \ -device usb-mouse \ -device usb-kbd \ - -bios ./OVMF.fd \ + -drive file=$ovmf_file,format=raw,if=pflash \ -chardev socket,id=charserial0,path=./kernel-console,server,nowait \ -device isa-serial,chardev=charserial0,id=serial0 \ -device intel-hda -device hda-duplex \ diff --git a/caas/start_flash_usb.sh b/caas/start_flash_usb.sh index 4b5866096..c396ef3fa 100755 --- a/caas/start_flash_usb.sh +++ b/caas/start_flash_usb.sh @@ -1,5 +1,20 @@ #!/bin/bash +[ $# -ne 1 ] && echo "Usage: $0 caas-flashfiles-eng-.zip" && exit -1 +[ -f "./android.qcow2" ] && echo "android.qcow2 already exsited, please backup/remove it before generating" && exit -1 + +qemu-img create -f qcow2 android.qcow2 16G + +[ -d "./flashfiles_decompress" ] && rm -rf "./flashfiles_decompress" +mkdir ./flashfiles_decompress +unzip $@ -d ./flashfiles_decompress +dd if=/dev/zero of=./flash.vfat bs=63M count=80 +mkfs.vfat ./flash.vfat +mcopy -i flash.vfat flashfiles_decompress/* :: + +ovmf_file="./OVMF.fd" +[ ! -f $ovmf_file ] && ovmf_file="/usr/share/qemu/OVMF.fd" + qemu-system-x86_64 \ -m 2048 -smp 2 -M q35 \ -name caas-vm \ @@ -10,9 +25,12 @@ qemu-system-x86_64 \ -chardev socket,id=charserial0,path=./kernel-console,server,nowait \ -device isa-serial,chardev=charserial0,id=serial0 \ -device qemu-xhci,id=xhci,addr=0x5 \ - -device usb-host,bus=xhci.0,vendorid=,productid= \ + -drive file=./flash.vfat,id=udisk1,format=raw,if=none \ + -device usb-storage,drive=udisk1,bus=xhci.0 \ -device virtio-scsi-pci,id=scsi0,addr=0x8 \ -drive file=./android.qcow2,if=none,format=qcow2,id=scsidisk1 \ -device scsi-hd,drive=scsidisk1,bus=scsi0.0 \ - -bios ./OVMF.fd \ + -drive file=$ovmf_file,format=raw,if=pflash \ + -no-reboot \ + -boot menu=on,splash-time=5000,strict=on \ From 34ca46540b314a0f8d8c927ed727d2344a4d389e Mon Sep 17 00:00:00 2001 From: buildslave Date: Mon, 14 Oct 2019 07:23:21 +0000 Subject: [PATCH 09/62] mixin updates Remove cp_ss This module is only required for the OTA across pre-P to P or successors. No requirement of O->Q now. And it will cause to ATS failure due to sepolicy. Tracked-On: OAM-86820 Mixin-Reviewed-On: https://github.com/projectceladon/device-androidia-mixins/pull/408 Signed-off-by: Huang Yang --- caas/device.mk | 1 - caas/init.rc | 9 --------- celadon_ivi/device.mk | 1 - celadon_ivi/init.rc | 9 --------- celadon_tablet/device.mk | 1 - celadon_tablet/init.rc | 9 --------- 6 files changed, 30 deletions(-) diff --git a/caas/device.mk b/caas/device.mk index a4e092fee..b603993ff 100644 --- a/caas/device.mk +++ b/caas/device.mk @@ -304,7 +304,6 @@ endif PRODUCT_PACKAGES += \ libtrusty \ storageproxyd \ - cp_ss \ libinteltrustystorage \ libinteltrustystorageinterface \ gatekeeper.trusty \ diff --git a/caas/init.rc b/caas/init.rc index 03521edfe..fa255edd7 100644 --- a/caas/init.rc +++ b/caas/init.rc @@ -170,15 +170,6 @@ on post-fs-data on early-boot start storageproxyd -on property:ro.vendor.copy.ss=1 - copy /data/misc/securestorage/0 /data/vendor/securestorage/0 - restart storageproxyd - -service cp_securestorage /vendor/bin/cp_ss - user system - group system - oneshot - service storageproxyd /vendor/bin/storageproxyd -d /dev/trusty-ipc-dev0 -p /data/vendor/securestorage -r /dev/rpmb0 user system group system diff --git a/celadon_ivi/device.mk b/celadon_ivi/device.mk index 829f6e3d9..6eb0b3794 100644 --- a/celadon_ivi/device.mk +++ b/celadon_ivi/device.mk @@ -322,7 +322,6 @@ endif PRODUCT_PACKAGES += \ libtrusty \ storageproxyd \ - cp_ss \ libinteltrustystorage \ libinteltrustystorageinterface \ gatekeeper.trusty \ diff --git a/celadon_ivi/init.rc b/celadon_ivi/init.rc index 59d8a6a38..7b33a6cad 100644 --- a/celadon_ivi/init.rc +++ b/celadon_ivi/init.rc @@ -185,15 +185,6 @@ on post-fs-data on early-boot start storageproxyd -on property:ro.vendor.copy.ss=1 - copy /data/misc/securestorage/0 /data/vendor/securestorage/0 - restart storageproxyd - -service cp_securestorage /vendor/bin/cp_ss - user system - group system - oneshot - service storageproxyd /vendor/bin/storageproxyd -d /dev/trusty-ipc-dev0 -p /data/vendor/securestorage -r /dev/rpmb0 user system group system diff --git a/celadon_tablet/device.mk b/celadon_tablet/device.mk index 2ae43ae8f..26799233a 100644 --- a/celadon_tablet/device.mk +++ b/celadon_tablet/device.mk @@ -335,7 +335,6 @@ endif PRODUCT_PACKAGES += \ libtrusty \ storageproxyd \ - cp_ss \ libinteltrustystorage \ libinteltrustystorageinterface \ gatekeeper.trusty \ diff --git a/celadon_tablet/init.rc b/celadon_tablet/init.rc index 177e4d28f..5f2d06259 100644 --- a/celadon_tablet/init.rc +++ b/celadon_tablet/init.rc @@ -170,15 +170,6 @@ on post-fs-data on early-boot start storageproxyd -on property:ro.vendor.copy.ss=1 - copy /data/misc/securestorage/0 /data/vendor/securestorage/0 - restart storageproxyd - -service cp_securestorage /vendor/bin/cp_ss - user system - group system - oneshot - service storageproxyd /vendor/bin/storageproxyd -d /dev/trusty-ipc-dev0 -p /data/vendor/securestorage -r /dev/rpmb0 user system group system From bce5ba9c72197e3d9807d3c1529e9da57ba0b776 Mon Sep 17 00:00:00 2001 From: buildslave Date: Mon, 14 Oct 2019 11:25:24 +0000 Subject: [PATCH 10/62] mixin updates Donot load VM when host kernel version lower than V5.0.0 Caas VM is working on host kernel newer than V5.0.0 with trusty enabled. Tracked-On: OAM-88232 Mixin-Reviewed-On: https://github.com/projectceladon/device-androidia-mixins/pull/429 Signed-off-by: Liu, Xinwu --- caas/setup_host.sh | 32 +++++++++++++++++++++----------- caas/start_android_qcow2.sh | 6 +++--- 2 files changed, 24 insertions(+), 14 deletions(-) diff --git a/caas/setup_host.sh b/caas/setup_host.sh index 8d2b9f0ce..70a50f79a 100755 --- a/caas/setup_host.sh +++ b/caas/setup_host.sh @@ -40,10 +40,15 @@ function ubu_install_qemu(){ } function ubu_enable_host_gvtg(){ - [[ ! `cat /etc/default/grub` =~ "i915.enable_gvt=1 intel_iommu=on" ]] \ - && sed -i "s/GRUB_CMDLINE_LINUX=\"/GRUB_CMDLINE_LINUX=\"i915.enable_gvt=1 intel_iommu=on /g" /etc/default/grub \ - && update-grub \ - && reboot_required=1 + if [[ ! `cat /etc/default/grub` =~ "i915.enable_gvt=1 intel_iommu=on" ]]; then + read -p "The grub entry in '/etc/default/grub' will be updated for enabling GVT-g, do you want to continue? [Y/n]" res + if [ x$res = xn ]; then + exit 0 + fi + sed -i "s/GRUB_CMDLINE_LINUX=\"/GRUB_CMDLINE_LINUX=\"i915.enable_gvt=1 intel_iommu=on /g" /etc/default/grub + update-grub + reboot_required=1 + fi } function check_network(){ @@ -75,8 +80,8 @@ function check_kernel(){ if [[ "$version" > "5.0.0" ]]; then echo "hardware rendering is supported in current kernel" else - echo "W: Detected linux version $version, software rendering will be used" - echo "W: Please upgrade kernel version newer than 5.0.0 for smoother experience!" + echo "W: Detected linux version $version" + echo "W: Please upgrade kernel version newer than 5.0.0!" fi } @@ -87,11 +92,16 @@ function clr_changes_require(){ } function clr_enable_host_gvtg(){ - [[ ! -f /etc/kernel/cmdline.d/gvtg.conf ]] \ - && mkdir -p /etc/kernel/cmdline.d/ \ - && echo "i915.enable_gvt=1 kvm.ignore_msrs=1 intel_iommu=on" > /etc/kernel/cmdline.d/gvtg.conf \ - && clr-boot-manager update \ - && reboot_required=1 + if [[ ! -f /etc/kernel/cmdline.d/gvtg.conf ]]; then + read -p "File '/etc/kernel/cmdline.d/gvtg.conf' will be created for enabling GVT-g, do you want to continue? [Y/n]" res + if [ x$res = xn ]; then + exit 0 + fi + mkdir -p /etc/kernel/cmdline.d/ + echo "i915.enable_gvt=1 kvm.ignore_msrs=1 intel_iommu=on" > /etc/kernel/cmdline.d/gvtg.conf + clr-boot-manager update + reboot_required=1 + fi } function get_required_scripts(){ diff --git a/caas/start_android_qcow2.sh b/caas/start_android_qcow2.sh index 795831133..eb3b93b2c 100755 --- a/caas/start_android_qcow2.sh +++ b/caas/start_android_qcow2.sh @@ -82,8 +82,8 @@ if [[ "$vno" > "5.0.0" ]]; then launch_swrender fi else - echo "W: Detected linux version $vno, fall to software rendering" - echo "W: Please upgrade kernel version newer than 5.0.0 for smoother experience!" - launch_swrender + echo "E: Detected linux version $vno" + echo "E: Please upgrade kernel version newer than 5.0.0!" + exit -1 fi From ff7884add9d71aecc930c12a74154a0f6a447961 Mon Sep 17 00:00:00 2001 From: Fei Jiang Date: Sat, 28 Sep 2019 16:22:14 +0800 Subject: [PATCH 11/62] add nn gpu hal support Tracked-On: OAM-86881 Signed-off-by: Fei Jiang --- caas/device.mk | 3 ++- caas/manifest.xml | 3 ++- celadon_ivi/device.mk | 3 ++- celadon_ivi/manifest.xml | 3 ++- celadon_tablet/device.mk | 3 ++- celadon_tablet/manifest.xml | 3 ++- 6 files changed, 12 insertions(+), 6 deletions(-) diff --git a/caas/device.mk b/caas/device.mk index b603993ff..46c6cbdb5 100644 --- a/caas/device.mk +++ b/caas/device.mk @@ -654,7 +654,8 @@ PRODUCT_PACKAGES += hdcpd # neuralnetworks HAL PRODUCT_PACKAGES += \ android.hardware.neuralnetworks@1.1-generic-service \ - android.hardware.neuralnetworks@1.1-generic-impl + android.hardware.neuralnetworks@1.1-generic-impl \ + android.hardware.neuralnetworks@1.2-service-gpgpu PRODUCT_PACKAGES += \ libinference_engine diff --git a/caas/manifest.xml b/caas/manifest.xml index 1e103f717..1578972a1 100644 --- a/caas/manifest.xml +++ b/caas/manifest.xml @@ -259,11 +259,12 @@ android.hardware.neuralnetworks hwbinder - 1.1 + 1.2 IDevice CPU GPU + gpgpu diff --git a/celadon_ivi/device.mk b/celadon_ivi/device.mk index 6eb0b3794..8abf402ec 100644 --- a/celadon_ivi/device.mk +++ b/celadon_ivi/device.mk @@ -665,7 +665,8 @@ PRODUCT_PACKAGES += hdcpd # neuralnetworks HAL PRODUCT_PACKAGES += \ android.hardware.neuralnetworks@1.1-generic-service \ - android.hardware.neuralnetworks@1.1-generic-impl + android.hardware.neuralnetworks@1.1-generic-impl \ + android.hardware.neuralnetworks@1.2-service-gpgpu PRODUCT_PACKAGES += \ libinference_engine diff --git a/celadon_ivi/manifest.xml b/celadon_ivi/manifest.xml index d790be5d5..aed803d4d 100644 --- a/celadon_ivi/manifest.xml +++ b/celadon_ivi/manifest.xml @@ -258,11 +258,12 @@ android.hardware.neuralnetworks hwbinder - 1.1 + 1.2 IDevice CPU GPU + gpgpu diff --git a/celadon_tablet/device.mk b/celadon_tablet/device.mk index 26799233a..3e7e2c09c 100644 --- a/celadon_tablet/device.mk +++ b/celadon_tablet/device.mk @@ -689,7 +689,8 @@ PRODUCT_PACKAGES += hdcpd # neuralnetworks HAL PRODUCT_PACKAGES += \ android.hardware.neuralnetworks@1.1-generic-service \ - android.hardware.neuralnetworks@1.1-generic-impl + android.hardware.neuralnetworks@1.1-generic-impl \ + android.hardware.neuralnetworks@1.2-service-gpgpu PRODUCT_PACKAGES += \ libinference_engine diff --git a/celadon_tablet/manifest.xml b/celadon_tablet/manifest.xml index 1e103f717..1578972a1 100644 --- a/celadon_tablet/manifest.xml +++ b/celadon_tablet/manifest.xml @@ -259,11 +259,12 @@ android.hardware.neuralnetworks hwbinder - 1.1 + 1.2 IDevice CPU GPU + gpgpu From 9f0cb0ff4793929583fdd8d2de4c094df897bf4b Mon Sep 17 00:00:00 2001 From: buildslave Date: Wed, 16 Oct 2019 01:04:10 +0000 Subject: [PATCH 12/62] mixin updates EM: Update power profile "cpu.core_power.cluster0" is a new power profile domain and used to caculate cpu power usage by BatteryStatsHelper.java. This patch adds this power profile for GP IVI. NOTE: the current values are fake data as no real battery in GP MRB. Tracked-On: OAM-86942 Mixin-Reviewed-On: https://github.com/projectceladon/device-androidia-mixins/pull/430 Signed-off-by: Sun Xinx --- celadon_ivi/manifest.xml | 2 +- .../base/core/res/res/xml/power_profile.xml | 25 +++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/celadon_ivi/manifest.xml b/celadon_ivi/manifest.xml index aed803d4d..c862e43a2 100644 --- a/celadon_ivi/manifest.xml +++ b/celadon_ivi/manifest.xml @@ -263,7 +263,7 @@ IDevice CPU GPU - gpgpu + gpgppu diff --git a/celadon_ivi/overlay/frameworks/base/core/res/res/xml/power_profile.xml b/celadon_ivi/overlay/frameworks/base/core/res/res/xml/power_profile.xml index 7c93d1775..8281b6cc7 100644 --- a/celadon_ivi/overlay/frameworks/base/core/res/res/xml/power_profile.xml +++ b/celadon_ivi/overlay/frameworks/base/core/res/res/xml/power_profile.xml @@ -63,6 +63,28 @@ 4 + + + 8 + 9 + 10 + 11 + 12 + 13 + 14 + 15 + 16 + 17 + 18 + 19 + 20 + 21 + 22 + 23 + 24 + + + + 1000 + 190 From 008dc1600f5bf428f4b4b71ef38926dc854e31cc Mon Sep 17 00:00:00 2001 From: buildslave Date: Thu, 17 Oct 2019 08:14:15 +0000 Subject: [PATCH 13/62] mixin updates x86: config: Enable support for RTL8152 dongle This patch adds support for RTL8152 USB ethernet dongle for Android platforms. This is an Android compliance requirement. Tracked-On: OAM-88225 Mixin-Reviewed-On: https://github.com/projectceladon/device-androidia-mixins/pull/434 Signed-off-by: saranya --- .../lts2018/bxt/android/non-embargoed/x86_64_defconfig | 2 +- .../lts2018/bxt/android/non-embargoed/x86_64_defconfig | 2 +- .../lts2018/bxt/android/non-embargoed/x86_64_defconfig | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/caas/config-lts/lts2018/bxt/android/non-embargoed/x86_64_defconfig b/caas/config-lts/lts2018/bxt/android/non-embargoed/x86_64_defconfig index dfcc6b3a8..a0c7781a1 100644 --- a/caas/config-lts/lts2018/bxt/android/non-embargoed/x86_64_defconfig +++ b/caas/config-lts/lts2018/bxt/android/non-embargoed/x86_64_defconfig @@ -2129,7 +2129,7 @@ CONFIG_USB_CATC=y CONFIG_USB_KAWETH=y CONFIG_USB_PEGASUS=y CONFIG_USB_RTL8150=y -# CONFIG_USB_RTL8152 is not set +CONFIG_USB_RTL8152=y # CONFIG_USB_LAN78XX is not set CONFIG_USB_USBNET=y CONFIG_USB_NET_AX8817X=y diff --git a/celadon_ivi/config-lts/lts2018/bxt/android/non-embargoed/x86_64_defconfig b/celadon_ivi/config-lts/lts2018/bxt/android/non-embargoed/x86_64_defconfig index dfcc6b3a8..a0c7781a1 100644 --- a/celadon_ivi/config-lts/lts2018/bxt/android/non-embargoed/x86_64_defconfig +++ b/celadon_ivi/config-lts/lts2018/bxt/android/non-embargoed/x86_64_defconfig @@ -2129,7 +2129,7 @@ CONFIG_USB_CATC=y CONFIG_USB_KAWETH=y CONFIG_USB_PEGASUS=y CONFIG_USB_RTL8150=y -# CONFIG_USB_RTL8152 is not set +CONFIG_USB_RTL8152=y # CONFIG_USB_LAN78XX is not set CONFIG_USB_USBNET=y CONFIG_USB_NET_AX8817X=y diff --git a/celadon_tablet/config-lts/lts2018/bxt/android/non-embargoed/x86_64_defconfig b/celadon_tablet/config-lts/lts2018/bxt/android/non-embargoed/x86_64_defconfig index dfcc6b3a8..a0c7781a1 100644 --- a/celadon_tablet/config-lts/lts2018/bxt/android/non-embargoed/x86_64_defconfig +++ b/celadon_tablet/config-lts/lts2018/bxt/android/non-embargoed/x86_64_defconfig @@ -2129,7 +2129,7 @@ CONFIG_USB_CATC=y CONFIG_USB_KAWETH=y CONFIG_USB_PEGASUS=y CONFIG_USB_RTL8150=y -# CONFIG_USB_RTL8152 is not set +CONFIG_USB_RTL8152=y # CONFIG_USB_LAN78XX is not set CONFIG_USB_USBNET=y CONFIG_USB_NET_AX8817X=y From f815f2c08c9437edd4962580842b51706e7e5441 Mon Sep 17 00:00:00 2001 From: buildslave Date: Thu, 17 Oct 2019 13:44:32 +0000 Subject: [PATCH 14/62] mixin updates Rebasing kernel tag to 4.19.78 Tracked-On: OAM-88281 Mixin-Reviewed-On: https://github.com/projectceladon/device-androidia-mixins/pull/435 Signed-off-by: rnaidu --- .../bxt/android/non-embargoed/x86_64_defconfig | 11 ++++++----- .../bxt/android/non-embargoed/x86_64_defconfig | 11 ++++++----- .../bxt/android/non-embargoed/x86_64_defconfig | 11 ++++++----- 3 files changed, 18 insertions(+), 15 deletions(-) diff --git a/caas/config-lts/lts2018/bxt/android/non-embargoed/x86_64_defconfig b/caas/config-lts/lts2018/bxt/android/non-embargoed/x86_64_defconfig index a0c7781a1..1ebafa925 100644 --- a/caas/config-lts/lts2018/bxt/android/non-embargoed/x86_64_defconfig +++ b/caas/config-lts/lts2018/bxt/android/non-embargoed/x86_64_defconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 4.19.66 Kernel Configuration +# Linux/x86_64 4.19.78 Kernel Configuration # # @@ -624,7 +624,7 @@ CONFIG_DCDBAS=y CONFIG_DMIID=y CONFIG_DMI_SYSFS=y CONFIG_DMI_SCAN_MACHINE_NON_EFI_FALLBACK=y -# CONFIG_ISCSI_IBFT_FIND is not set +# CONFIG_ISCSI_IBFT is not set # CONFIG_FW_CFG_SYSFS is not set # CONFIG_GOOGLE_FIRMWARE is not set @@ -2276,7 +2276,7 @@ CONFIG_INPUT_MOUSEDEV=y # CONFIG_INPUT_MOUSEDEV_PSAUX is not set CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 -# CONFIG_INPUT_JOYDEV is not set +CONFIG_INPUT_JOYDEV=y CONFIG_INPUT_EVDEV=y # CONFIG_INPUT_EVBUG is not set @@ -4151,7 +4151,7 @@ CONFIG_SND_X86=y # HID support # CONFIG_HID=y -# CONFIG_HID_BATTERY_STRENGTH is not set +CONFIG_HID_BATTERY_STRENGTH=y CONFIG_HIDRAW=y CONFIG_UHID=y CONFIG_HID_GENERIC=y @@ -4226,7 +4226,8 @@ CONFIG_HID_NTRIG=m # CONFIG_HID_ROCCAT is not set # CONFIG_HID_SAITEK is not set # CONFIG_HID_SAMSUNG is not set -# CONFIG_HID_SONY is not set +CONFIG_HID_SONY=y +CONFIG_SONY_FF=y # CONFIG_HID_SPEEDLINK is not set # CONFIG_HID_STEAM is not set # CONFIG_HID_STEELSERIES is not set diff --git a/celadon_ivi/config-lts/lts2018/bxt/android/non-embargoed/x86_64_defconfig b/celadon_ivi/config-lts/lts2018/bxt/android/non-embargoed/x86_64_defconfig index a0c7781a1..1ebafa925 100644 --- a/celadon_ivi/config-lts/lts2018/bxt/android/non-embargoed/x86_64_defconfig +++ b/celadon_ivi/config-lts/lts2018/bxt/android/non-embargoed/x86_64_defconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 4.19.66 Kernel Configuration +# Linux/x86_64 4.19.78 Kernel Configuration # # @@ -624,7 +624,7 @@ CONFIG_DCDBAS=y CONFIG_DMIID=y CONFIG_DMI_SYSFS=y CONFIG_DMI_SCAN_MACHINE_NON_EFI_FALLBACK=y -# CONFIG_ISCSI_IBFT_FIND is not set +# CONFIG_ISCSI_IBFT is not set # CONFIG_FW_CFG_SYSFS is not set # CONFIG_GOOGLE_FIRMWARE is not set @@ -2276,7 +2276,7 @@ CONFIG_INPUT_MOUSEDEV=y # CONFIG_INPUT_MOUSEDEV_PSAUX is not set CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 -# CONFIG_INPUT_JOYDEV is not set +CONFIG_INPUT_JOYDEV=y CONFIG_INPUT_EVDEV=y # CONFIG_INPUT_EVBUG is not set @@ -4151,7 +4151,7 @@ CONFIG_SND_X86=y # HID support # CONFIG_HID=y -# CONFIG_HID_BATTERY_STRENGTH is not set +CONFIG_HID_BATTERY_STRENGTH=y CONFIG_HIDRAW=y CONFIG_UHID=y CONFIG_HID_GENERIC=y @@ -4226,7 +4226,8 @@ CONFIG_HID_NTRIG=m # CONFIG_HID_ROCCAT is not set # CONFIG_HID_SAITEK is not set # CONFIG_HID_SAMSUNG is not set -# CONFIG_HID_SONY is not set +CONFIG_HID_SONY=y +CONFIG_SONY_FF=y # CONFIG_HID_SPEEDLINK is not set # CONFIG_HID_STEAM is not set # CONFIG_HID_STEELSERIES is not set diff --git a/celadon_tablet/config-lts/lts2018/bxt/android/non-embargoed/x86_64_defconfig b/celadon_tablet/config-lts/lts2018/bxt/android/non-embargoed/x86_64_defconfig index a0c7781a1..1ebafa925 100644 --- a/celadon_tablet/config-lts/lts2018/bxt/android/non-embargoed/x86_64_defconfig +++ b/celadon_tablet/config-lts/lts2018/bxt/android/non-embargoed/x86_64_defconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 4.19.66 Kernel Configuration +# Linux/x86_64 4.19.78 Kernel Configuration # # @@ -624,7 +624,7 @@ CONFIG_DCDBAS=y CONFIG_DMIID=y CONFIG_DMI_SYSFS=y CONFIG_DMI_SCAN_MACHINE_NON_EFI_FALLBACK=y -# CONFIG_ISCSI_IBFT_FIND is not set +# CONFIG_ISCSI_IBFT is not set # CONFIG_FW_CFG_SYSFS is not set # CONFIG_GOOGLE_FIRMWARE is not set @@ -2276,7 +2276,7 @@ CONFIG_INPUT_MOUSEDEV=y # CONFIG_INPUT_MOUSEDEV_PSAUX is not set CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 -# CONFIG_INPUT_JOYDEV is not set +CONFIG_INPUT_JOYDEV=y CONFIG_INPUT_EVDEV=y # CONFIG_INPUT_EVBUG is not set @@ -4151,7 +4151,7 @@ CONFIG_SND_X86=y # HID support # CONFIG_HID=y -# CONFIG_HID_BATTERY_STRENGTH is not set +CONFIG_HID_BATTERY_STRENGTH=y CONFIG_HIDRAW=y CONFIG_UHID=y CONFIG_HID_GENERIC=y @@ -4226,7 +4226,8 @@ CONFIG_HID_NTRIG=m # CONFIG_HID_ROCCAT is not set # CONFIG_HID_SAITEK is not set # CONFIG_HID_SAMSUNG is not set -# CONFIG_HID_SONY is not set +CONFIG_HID_SONY=y +CONFIG_SONY_FF=y # CONFIG_HID_SPEEDLINK is not set # CONFIG_HID_STEAM is not set # CONFIG_HID_STEELSERIES is not set From c9333cf93c809a3c36a63c83d3fd4a8991202312 Mon Sep 17 00:00:00 2001 From: sarora2x Date: Mon, 21 Oct 2019 16:47:23 +0530 Subject: [PATCH 15/62] Fix for ADB over usb. Set usb-ota-switch to true. Tracked-On: OAM-88331 Signed-off-by: sarora2x Signed-off-by: M Balaji --- caas/mixins.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/caas/mixins.spec b/caas/mixins.spec index 2e89090a1..c88c0a302 100755 --- a/caas/mixins.spec +++ b/caas/mixins.spec @@ -60,7 +60,7 @@ firststage-mount: true cpuset: autocores usb-init: true usb-audio-init: true -usb-otg-switch: false +usb-otg-switch: true vndk: true public-libraries: true device-specific: caas From 910898b3a4a33bb5ac3f9a6e195f1d8acea79dc5 Mon Sep 17 00:00:00 2001 From: buildslave Date: Tue, 22 Oct 2019 13:32:54 +0000 Subject: [PATCH 16/62] mixin updates Fix for ADB over usb. Set usb-ota-switch to true. Tracked-On: OAM-88331 Mixin-Reviewed-On: https://github.com/projectceladon/device-androidia/pull/616 Signed-off-by: M Balaji Signed-off-by: sarora2x --- caas/BoardConfig.mk | 4 +++ caas/device.mk | 5 ++++ .../usb-otg-switch/usb_otg_switch.sh | 25 +++++++++++++++++++ caas/init.rc | 14 +++++++++++ caas/ueventd.rc | 4 +++ 5 files changed, 52 insertions(+) create mode 100755 caas/extra_files/usb-otg-switch/usb_otg_switch.sh diff --git a/caas/BoardConfig.mk b/caas/BoardConfig.mk index 0ef4ea182..835a50b3c 100644 --- a/caas/BoardConfig.mk +++ b/caas/BoardConfig.mk @@ -573,6 +573,10 @@ BOARD_SEPOLICY_DIRS += $(INTEL_PATH_SEPOLICY)/abota/generic/vendor_prefix ############################################################## BOARD_SEPOLICY_DIRS += $(INTEL_PATH_SEPOLICY)/usb-init ############################################################## +# Source: device/intel/mixins/groups/usb-otg-switch/true/BoardConfig.mk +############################################################## +BOARD_SEPOLICY_DIRS += $(INTEL_PATH_SEPOLICY)/usb-role-switch +############################################################## # Source: device/intel/mixins/groups/vndk/true/BoardConfig.mk ############################################################## BOARD_VNDK_VERSION := current diff --git a/caas/device.mk b/caas/device.mk index 46c6cbdb5..63640a4af 100644 --- a/caas/device.mk +++ b/caas/device.mk @@ -637,6 +637,11 @@ PRODUCT_PACKAGES += android.hardware.health@2.0-service.intel ABOTA_BOOTARCH=project-celadon +############################################################## +# Source: device/intel/mixins/groups/usb-otg-switch/true/product.mk +############################################################## + +PRODUCT_COPY_FILES += $(LOCAL_PATH)/extra_files/usb-otg-switch/usb_otg_switch.sh:vendor/bin/usb_otg_switch.sh ############################################################## # Source: device/intel/mixins/groups/public-libraries/true/product.mk ############################################################## diff --git a/caas/extra_files/usb-otg-switch/usb_otg_switch.sh b/caas/extra_files/usb-otg-switch/usb_otg_switch.sh new file mode 100755 index 000000000..7b0b68e81 --- /dev/null +++ b/caas/extra_files/usb-otg-switch/usb_otg_switch.sh @@ -0,0 +1,25 @@ +#!/vendor/bin/sh + +KERNEL_VERSION=$(uname -r) + +echo $1 +if [[ $1 = "h" ]]; then + case "$KERNEL_VERSION" in + 4.4*) echo h > /sys/bus/platform/devices/intel-cht-otg.0/mux_state ;; + 4.9*) echo h > /sys/bus/platform/drivers/intel_usb_dr_phy/intel_usb_dr_phy.0/mux_state ;; + *) echo "host" > /sys/class/usb_role/intel_xhci_usb_sw-role-switch/role ;; + esac + +elif [[ $1 = "p" ]]; then + case "$KERNEL_VERSION" in + 4.4*) echo p > /sys/bus/platform/devices/intel-cht-otg.0/mux_state ;; + 4.9*) echo p > /sys/bus/platform/drivers/intel_usb_dr_phy/intel_usb_dr_phy.0/mux_state ;; + *) echo "device" > /sys/class/usb_role/intel_xhci_usb_sw-role-switch/role ;; + esac + +else + echo "Please input h to swith to USB OTG mode" + echo "usb_otg_switch.sh h" + echo "Please input p to swith USB device mode" + echo "usb_otg_switch.sh p" +fi diff --git a/caas/init.rc b/caas/init.rc index fa255edd7..a7454078e 100644 --- a/caas/init.rc +++ b/caas/init.rc @@ -546,6 +546,20 @@ on early-boot copy /sys/devices/system/cpu/online /dev/cpuset/top-app/cpus copy /sys/devices/system/cpu/online /dev/cpuset/foreground/boost/cpus ############################################################## +# Source: device/intel/mixins/groups/usb-otg-switch/true/init.rc +############################################################## +on boot + setprop vendor.sys.usb.role device + +on property:sys.boot_completed=1 + setprop vendor.sys.usb.role device + +on property:vendor.sys.usb.role=host + exec - system system -- /vendor/bin/usb_otg_switch.sh h + +on property:vendor.sys.usb.role=device + exec - system system -- /vendor/bin/usb_otg_switch.sh p +############################################################## # Source: device/intel/mixins/groups/hdcpd/true/init.rc ############################################################## # Note that this service must start as root to set up a mem-mapped region diff --git a/caas/ueventd.rc b/caas/ueventd.rc index f01e88ef7..664ea442f 100644 --- a/caas/ueventd.rc +++ b/caas/ueventd.rc @@ -64,6 +64,10 @@ /sys/devices/platform/*/i2c-*/i2c-* power_HAL_suspend 0644 system system /sys/bus/i2c/devices/i2c-* power_HAL_suspend 0644 system system +############################################################## +# Source: device/intel/mixins/groups/usb-otg-switch/true/ueventd.rc +############################################################## +/sys/devices/pci0000:00/0000:00:*.0/intel_xhci_usb_sw/usb_role/intel_xhci_usb_sw-role-switch role 0664 system system ############################################################## # Source: device/intel/mixins/groups/dbc/true/ueventd.rc ############################################################## From d2d08b6f978d6d042b21de75a9357ccce6706f54 Mon Sep 17 00:00:00 2001 From: Jeevaka Prabu Badrappan Date: Fri, 18 Oct 2019 09:34:14 +0530 Subject: [PATCH 17/62] Bluetooth and WLAN mixin changes to adopt aaf Bluetooth and WLAN mixin changed to auto. Tracked-On: OAM-88286 Signed-off-by: Jeevaka Prabu Badrappan Signed-off-by: Aiswarya Cyriac --- caas/mixins.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/caas/mixins.spec b/caas/mixins.spec index c88c0a302..821e2143d 100755 --- a/caas/mixins.spec +++ b/caas/mixins.spec @@ -11,7 +11,7 @@ kernel: gmin64(useprebuilt=false,src_path=kernel/lts2018, loglevel=7, interactiv disk-bus: auto boot-arch: project-celadon(uefi_arch=x86_64,fastboot=efi,ignore_rsci=true,disable_watchdog=true,watchdog_parameters=10 30,verity_warning=false,txe_bind_root_of_trust=false,bootloader_block_size=4096,verity_mode=false,disk_encryption=false,file_encryption=false,target=caas,rpmb_simulate=true,ignore_not_applicable_reset=true,self_usb_device_mode_protocol=true,usb_storage=true,live_boot=true) sepolicy: permissive -bluetooth: btusb(ivi=true) +bluetooth: auto(ivi=false) audio: project-celadon vendor-partition: true(partition_size=600,partition_name=vendor) acpio-partition: true(partition_size=2) @@ -28,7 +28,7 @@ storage: sdcard-mmc0-usb-sd(adoptablesd=true,adoptableusb=true) ethernet: dhcp camera-ext: ext-camera-only rfkill: true(force_disable=) -wlan: iwlwifi(libwifi-hal=true) +wlan: auto codecs: configurable(hw_ve_h265=true, hw_vd_vp9=true, hw_vd_mp2=true, hw_vd_vc1=false, platform=bxt) codec2: true usb: host From 84b1d862cb90b899c4cc7298c460e17653815831 Mon Sep 17 00:00:00 2001 From: buildslave Date: Wed, 23 Oct 2019 01:47:06 +0000 Subject: [PATCH 18/62] mixin updates Bluetooth and WLAN mixin changes to adopt aaf Changes done: - Enabled new mixin group auto for bluetooth and wlan - Added generic libraries and packages neeed for bluetooth and wlan to support multiple connectivity modules. - Bluetooth profiles updated to match tablet device type - Set property persist.bluetooth.enablenewavrcpto true to get BT A2DP, AVRCP working. - Based on detected bluetooth chip set vendor property vendor.bluetooth.chip. Bluetooth and WLAN mixin changes to adopt aaf Bluetooth and WLAN mixin changed to auto. Tracked-On: OAM-88286 Mixin-Reviewed-On: https://github.com/projectceladon/device-androidia-mixins/pull/436 Mixin-Reviewed-On: https://github.com/projectceladon/device-androidia/pull/615 Signed-off-by: Aiswarya Cyriac Signed-off-by: Jeevaka Prabu Badrappan --- caas/AndroidBoard.mk | 8 +-- caas/BoardConfig.mk | 61 ++----------------- caas/device.mk | 59 +++++------------- caas/extra_files/bluetooth/auto_hal.in | 28 +++++++++ caas/extra_files/bluetooth/load_bt.in | 10 --- caas/extra_files/wlan/load_iwlwifi.in | 9 --- caas/extra_files/wlan/load_legacy_iwlwifi.in | 7 --- caas/init.rc | 31 +--------- caas/manifest.xml | 9 --- .../base/core/res/res/values/config.xml | 3 - .../apps/Bluetooth/res/values/config.xml | 21 ++++--- caas/system.prop | 2 +- caas/ueventd.rc | 9 +-- 13 files changed, 65 insertions(+), 192 deletions(-) create mode 100644 caas/extra_files/bluetooth/auto_hal.in delete mode 100644 caas/extra_files/bluetooth/load_bt.in delete mode 100644 caas/extra_files/wlan/load_iwlwifi.in delete mode 100644 caas/extra_files/wlan/load_legacy_iwlwifi.in diff --git a/caas/AndroidBoard.mk b/caas/AndroidBoard.mk index 13f74168f..70da774e3 100644 --- a/caas/AndroidBoard.mk +++ b/caas/AndroidBoard.mk @@ -219,10 +219,6 @@ make_bootloader_dir: $(PRODUCT_OUT)/ramdisk.img: make_bootloader_dir -############################################################## -# Source: device/intel/mixins/groups/wlan/iwlwifi/AndroidBoard.mk -############################################################## -LOAD_MODULES_IN += $(TARGET_DEVICE_DIR)/extra_files/wlan/load_legacy_iwlwifi.in ############################################################## # Source: device/intel/mixins/groups/kernel/gmin64/AndroidBoard.mk.1 ############################################################## @@ -481,9 +477,9 @@ LOCAL_POST_INSTALL_CMD := $(INTEL_PATH_SEPOLICY)/tools/capchecker $(LOCAL_USER_O include $(BUILD_PHONY_PACKAGE) ############################################################## -# Source: device/intel/mixins/groups/bluetooth/btusb/AndroidBoard.mk +# Source: device/intel/mixins/groups/bluetooth/auto/AndroidBoard.mk ############################################################## -LOAD_MODULES_IN += $(TARGET_DEVICE_DIR)/extra_files/bluetooth/load_bt.in +AUTO_IN += $(TARGET_DEVICE_DIR)/extra_files/bluetooth/auto_hal.in ############################################################## # Source: device/intel/mixins/groups/audio/project-celadon/AndroidBoard.mk ############################################################## diff --git a/caas/BoardConfig.mk b/caas/BoardConfig.mk index 835a50b3c..877fb9778 100644 --- a/caas/BoardConfig.mk +++ b/caas/BoardConfig.mk @@ -148,66 +148,14 @@ KERNELFLINGER_SUPPORT_USB_STORAGE ?= true KERNELFLINGER_SUPPORT_LIVE_BOOT ?= true ############################################################## -# Source: device/intel/mixins/groups/wlan/iwlwifi/BoardConfig.mk +# Source: device/intel/mixins/groups/wlan/auto/BoardConfig.mk ############################################################## # This enables the wpa wireless driver BOARD_HOSTAPD_DRIVER := NL80211 BOARD_WPA_SUPPLICANT_DRIVER := NL80211 WPA_SUPPLICANT_VERSION := VER_2_1_DEVEL -# required for wifi HAL support -BOARD_WLAN_DEVICE := iwlwifi - -BOARD_WPA_SUPPLICANT_PRIVATE_LIB ?= lib_driver_cmd_intc - -# Enabling iwlwifi -BOARD_USING_INTEL_IWL := true -INTEL_IWL_MODULE_SUB_FOLDER := dev -INTEL_IWL_PLATFORM := kbl -INTEL_IWL_BOARD_CONFIG := kbl -INTEL_IWL_PNVM_HW := DEFAULT -INTEL_IWL_USE_COMPAT_INSTALL := y -INTEL_IWL_COMPAT_INSTALL_DIR := updates -INTEL_IWL_COMPAT_INSTALL_PATH ?= . -INTEL_IWL_INSTALL_MOD_STRIP := INSTALL_MOD_STRIP=1 -CROSS_COMPILE ?= CROSS_COMPILE=$(YOCTO_CROSSCOMPILE) -INSTALLED_KERNEL_TARGET ?= $(PREVIOUS_KERNEL_MODULE) -KERNEL_OUT_DIR ?= $(PRODUCT_OUT)/obj/kernel - -COMBO_CHIP_VENDOR := intel -COMBO_CHIP := lnp - -# SoftAp FW reload definitions. -# we don't really need this, it's to avoid error when the framework -# will trigger the fwReloadSoftap function, what will lead to an error -# enabling the SoftAp. -# so we set up this for letting the function execute gracefully. -WIFI_DRIVER_FW_PATH_STA := "/vendor/firmware/iwlwifi-softap-dummy.ucode" -WIFI_DRIVER_FW_PATH_AP := "/vendor/firmware/iwlwifi-softap-dummy.ucode" -WIFI_DRIVER_FW_PATH_P2P := "/vendor/firmware/iwlwifi-softap-dummy.ucode" -WIFI_DRIVER_FW_PATH_PARAM := "/dev/null" - -# config_wifi_background_scan_support=true: -DEVICE_PACKAGE_OVERLAYS += $(INTEL_PATH_COMMON)/wlan/overlay-pno - -DEVICE_PACKAGE_OVERLAYS += $(INTEL_PATH_COMMON)/wlan/overlay-tcp-buffers - -# Add SIM , AKA and AKA' methods in EAP entries of WiFi UI -DEVICE_PACKAGE_OVERLAYS += $(INTEL_PATH_COMMON)/wlan/overlay-eap-methods - -ifneq (lhp,$(INTEL_IWL_MODULE_SUB_FOLDER)) - DEVICE_PACKAGE_OVERLAYS += $(INTEL_PATH_COMMON)/wlan/overlay-dual-band -endif - -# WiDi / Miracast Optimisations -DEVICE_PACKAGE_OVERLAYS += $(INTEL_PATH_COMMON)/wlan/overlay-miracast-go -DEVICE_PACKAGE_OVERLAYS += $(INTEL_PATH_COMMON)/wlan/overlay-p2p-connected-stop-scan -DEVICE_PACKAGE_OVERLAYS += $(INTEL_PATH_COMMON)/wlan/overlay-miracast-force-single-ch - -BOARD_SEPOLICY_DIRS += $(INTEL_PATH_SEPOLICY)/wlan/load_iwlwifi - -BOARD_SEPOLICY_M4DEFS += module_iwlwifi=true -BOARD_SEPOLICY_DIRS += $(INTEL_PATH_SEPOLICY)/wlan/iwlwifi +BOARD_SEPOLICY_DIRS += $(INTEL_PATH_SEPOLICY)/wlan/common ############################################################## # Source: device/intel/mixins/groups/kernel/gmin64/BoardConfig.mk.1 ############################################################## @@ -254,10 +202,11 @@ BOARD_SEPOLICY_DIRS += $(INTEL_PATH_SEPOLICY) # Pass device target to build in BOARD_SEPOLICY_M4DEFS += board_sepolicy_target_product=$(TARGET_PRODUCT) ############################################################## -# Source: device/intel/mixins/groups/bluetooth/btusb/BoardConfig.mk +# Source: device/intel/mixins/groups/bluetooth/auto/BoardConfig.mk ############################################################## BOARD_HAVE_BLUETOOTH_INTEL_ICNV := true -BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := $(INTEL_PATH_COMMON)/bluetooth/intel/car/ +BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := $(INTEL_PATH_COMMON)/bluetooth/tablet/ + DEVICE_PACKAGE_OVERLAYS += $(INTEL_PATH_COMMON)/bluetooth/overlay-bt-pan BOARD_SEPOLICY_DIRS += $(INTEL_PATH_SEPOLICY)/bluetooth/common ############################################################## diff --git a/caas/device.mk b/caas/device.mk index 63640a4af..838823279 100644 --- a/caas/device.mk +++ b/caas/device.mk @@ -81,7 +81,7 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/gsi_keys.mk) KERNELFLINGER_SUPPORT_KEYBOX_PROVISION := true ############################################################## -# Source: device/intel/mixins/groups/wlan/iwlwifi/product.mk +# Source: device/intel/mixins/groups/wlan/auto/product.mk ############################################################## PRODUCT_PACKAGES += \ hostapd \ @@ -93,32 +93,15 @@ PRODUCT_PACKAGES += \ iw PRODUCT_PACKAGES += \ - android.hardware.wifi@1.0-service + android.hardware.wifi@1.0-service -# FW and PNVM -PRODUCT_PACKAGES += \ - iwl-nvm - -# iwlwifi USC -PRODUCT_PACKAGES += \ - wifi_intel_usc - -#copy iwlwifi wpa config files PRODUCT_COPY_FILES += \ - $(INTEL_PATH_COMMON)/wlan/wpa_supplicant-common.conf:vendor/etc/wifi/wpa_supplicant.conf \ - $(INTEL_PATH_COMMON)/wlan/iwlwifi/wpa_supplicant_overlay.conf:vendor/etc/wifi/wpa_supplicant_overlay.conf \ - $(INTEL_PATH_COMMON)/wlan/iwlwifi/p2p_supplicant_overlay.conf:vendor/etc/wifi/p2p_supplicant_overlay.conf \ - frameworks/native/data/etc/android.hardware.wifi.xml:vendor/etc/permissions/android.hardware.wifi.xml \ - frameworks/native/data/etc/android.hardware.wifi.direct.xml:vendor/etc/permissions/android.hardware.wifi.direct.xml - -PRODUCT_COPY_FILES += \ - vendor/linux/firmware/iwlwifi-9260-th-b0-jf-b0-43.ucode:$(TARGET_COPY_OUT_VENDOR)/firmware/iwlwifi-9260-th-b0-jf-b0-43.ucode \ - vendor/linux/firmware/iwlwifi-3168-29.ucode:$(TARGET_COPY_OUT_VENDOR)/firmware/iwlwifi-3168-29.ucode \ - vendor/linux/firmware/iwlwifi-8265-36.ucode:$(TARGET_COPY_OUT_VENDOR)/firmware/iwlwifi-8265-36.ucode - - -PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ - ro.wifi.softap_dualband_allow=false + $(INTEL_PATH_COMMON)/wlan/wpa_supplicant-common.conf:vendor/etc/wifi/wpa_supplicant.conf \ + $(INTEL_PATH_COMMON)/wlan/wpa_supplicant_overlay.conf:vendor/etc/wifi/wpa_supplicant_overlay.conf \ + $(INTEL_PATH_COMMON)/wlan/p2p_supplicant_overlay.conf:vendor/etc/wifi/p2p_supplicant_overlay.conf \ + $(INTEL_PATH_COMMON)/wlan/wlan.conf:system/etc/modprobe.d/wlan.conf \ + frameworks/native/data/etc/android.hardware.wifi.xml:vendor/etc/permissions/android.hardware.wifi.xml \ + frameworks/native/data/etc/android.hardware.wifi.direct.xml:vendor/etc/permissions/android.hardware.wifi.direct.xml PRODUCT_PACKAGE_OVERLAYS += $(INTEL_PATH_COMMON)/wlan/overlay-disable_keepalive_offload ############################################################## @@ -138,12 +121,14 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.vendor.boot.moduleslocation=/$(KERNEL_M ############################################################## PRODUCT_PACKAGES += sepolicy-areq-checker ############################################################## -# Source: device/intel/mixins/groups/bluetooth/btusb/product.mk +# Source: device/intel/mixins/groups/bluetooth/auto/product.mk ############################################################## +PRODUCT_PACKAGES += \ + hciconfig + # Bluetooth tools eng / userdebug ifneq ($(TARGET_BUILD_VARIANT),user) PRODUCT_PACKAGES += \ - hciconfig \ btmon \ hcitool endif @@ -152,27 +137,14 @@ PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.bluetooth.xml:vendor/etc/permissions/android.hardware.bluetooth.xml \ frameworks/native/data/etc/android.hardware.bluetooth_le.xml:vendor/etc/permissions/android.hardware.bluetooth_le.xml -PRODUCT_COPY_FILES += \ - vendor/linux/firmware/intel/ibt-18-16-1.ddc:$(TARGET_COPY_OUT_VENDOR)/firmware/intel/ibt-18-16-1.ddc \ - vendor/linux/firmware/intel/ibt-18-16-1.sfi:$(TARGET_COPY_OUT_VENDOR)/firmware/intel/ibt-18-16-1.sfi \ - vendor/linux/firmware/intel/ibt-18-2.ddc:$(TARGET_COPY_OUT_VENDOR)/firmware/intel/ibt-18-2.ddc \ - vendor/linux/firmware/intel/ibt-18-2.sfi:$(TARGET_COPY_OUT_VENDOR)/firmware/intel/ibt-18-2.sfi \ - vendor/linux/firmware/intel/ibt-12-16.ddc:$(TARGET_COPY_OUT_VENDOR)/firmware/intel/ibt-12-16.ddc \ - vendor/linux/firmware/intel/ibt-12-16.sfi:$(TARGET_COPY_OUT_VENDOR)/firmware/intel/ibt-12-16.sfi \ - vendor/linux/firmware/intel/ibt-hw-37.8.10-fw-22.50.19.14.f.bseq:$(TARGET_COPY_OUT_VENDOR)/firmware/intel/ibt-hw-37.8.10-fw-22.50.19.14.f.bseq - -PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/extra_files/bluetooth/bluetooth_auto_detection.sh:vendor/bin/bluetooth_auto_detection.sh - PRODUCT_PROPERTY_OVERRIDES += bluetooth.rfkill=1 PRODUCT_PACKAGES += \ android.hardware.bluetooth@1.0-service.vbt \ libbt-vendor \ -PRODUCT_PACKAGE_OVERLAYS += $(INTEL_PATH_COMMON)/bluetooth/overlay-car -PRODUCT_PACKAGE_OVERLAYS += $(INTEL_PATH_COMMON)/bluetooth/intel/car/overlay +PRODUCT_PACKAGE_OVERLAYS += $(INTEL_PATH_COMMON)/bluetooth/overlay-tablet ############################################################## # Source: device/intel/mixins/groups/audio/project-celadon/product.mk @@ -265,8 +237,6 @@ PRODUCT_COPY_FILES += \ PRODUCT_PACKAGES += android.hardware.keymaster@3.0-impl \ android.hardware.keymaster@3.0-service \ - android.hardware.wifi@1.0-service \ - android.hardware.bluetooth@1.0-service.vbt \ android.hardware.usb@1.0-impl \ android.hardware.usb@1.0-service \ android.hardware.dumpstate@1.0-impl \ @@ -279,8 +249,7 @@ PRODUCT_PACKAGES += android.hardware.keymaster@3.0-impl \ android.hardware.graphics.allocator@2.0-service \ android.hardware.renderscript@1.0-impl \ android.hardware.graphics.composer@2.1-impl \ - android.hardware.graphics.composer@2.1-service \ - libbt-vendor + android.hardware.graphics.composer@2.1-service PRODUCT_COPY_FILES += $(LOCAL_PATH)/manifest.xml:vendor/manifest.xml ############################################################## diff --git a/caas/extra_files/bluetooth/auto_hal.in b/caas/extra_files/bluetooth/auto_hal.in new file mode 100644 index 000000000..7d5cf329e --- /dev/null +++ b/caas/extra_files/bluetooth/auto_hal.in @@ -0,0 +1,28 @@ +auto_hal() { +usb_devices="/sys/kernel/debug/usb/devices" + +hciconfig | grep -q hci + +if [ $? != 0 ]; then + echo "hci interface not found" + return +fi + +cat $usb_devices | grep -q "Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb" +if [ $? == 0 ]; then + cat $usb_devices | grep -q "Vendor=1286" + if [ $? == 0 ]; then + echo "Marvell Bluetooth controller" + setprop vendor.bluetooth.chip "marvell" + else + cat $usb_devices | grep -q "Vendor=8087" + if [ $? == 0 ]; then + echo "Intel Bluetooth Controller" + setprop vendor.bluetooth.chip "intel" + fi + fi +else + echo "No bluetooth device connected" +fi +} +auto_hal& diff --git a/caas/extra_files/bluetooth/load_bt.in b/caas/extra_files/bluetooth/load_bt.in deleted file mode 100644 index 23d899456..000000000 --- a/caas/extra_files/bluetooth/load_bt.in +++ /dev/null @@ -1,10 +0,0 @@ -load_bt_modules() { -insmod $modules/ecdh_generic.ko -insmod $modules/bluetooth.ko -insmod $modules/btintel.ko -insmod $modules/btbcm.ko -insmod $modules/btrtl.ko -insmod $modules/btusb.ko -insmod $modules/btusb_sco_snd_card.ko -} -load_bt_modules& diff --git a/caas/extra_files/wlan/load_iwlwifi.in b/caas/extra_files/wlan/load_iwlwifi.in deleted file mode 100644 index a40725443..000000000 --- a/caas/extra_files/wlan/load_iwlwifi.in +++ /dev/null @@ -1,9 +0,0 @@ -load_iwlwifi_modules() { - insmod $modules/compat.ko - - insmod $modules/cfg80211.ko - insmod $modules/mac80211.ko - insmod $modules/iwlwifi.ko d0i3_disable=1 - insmod $modules/iwlmvm.ko power_scheme=1 -} -load_iwlwifi_modules& diff --git a/caas/extra_files/wlan/load_legacy_iwlwifi.in b/caas/extra_files/wlan/load_legacy_iwlwifi.in deleted file mode 100644 index a6b4672bc..000000000 --- a/caas/extra_files/wlan/load_legacy_iwlwifi.in +++ /dev/null @@ -1,7 +0,0 @@ -load_iwlwifi_modules() { - insmod $modules/cfg80211.ko - insmod $modules/mac80211.ko - insmod $modules/iwlwifi.ko d0i3_disable=1 - insmod $modules/iwlmvm.ko power_scheme=1 -} -load_iwlwifi_modules& diff --git a/caas/init.rc b/caas/init.rc index a7454078e..c38c554c6 100644 --- a/caas/init.rc +++ b/caas/init.rc @@ -21,14 +21,10 @@ service watchdogd /system/bin/watchdogd 10 30 on charger start watchdogd ############################################################## -# Source: device/intel/mixins/groups/wlan/iwlwifi/init.rc +# Source: device/intel/mixins/groups/wlan/auto/init.rc ############################################################## on post-fs-data chmod 0660 /data/misc/wifi/p2p_supplicant.conf - - # create config WiFi NVM folder - mkdir /oem_config/wlan 0770 wifi system - setprop wifi.interface wlan0 setprop wifi.direct.interface p2p-dev-wlan0 @@ -69,7 +65,6 @@ service dhcpcd_p2p /system/bin/dhcpcd -aABKL service iprenew_p2p /system/bin/dhcpcd -n disabled oneshot - ############################################################## # Source: device/intel/mixins/groups/kernel/gmin64/init.rc ############################################################## @@ -86,30 +81,6 @@ on boot on boot setrlimit 8 8388608 8388608 ############################################################## -# Source: device/intel/mixins/groups/bluetooth/btusb/init.rc -############################################################## -on post-fs-data - # To store BT paired info - mkdir /data/misc/hcid 0770 bluetooth bluetooth - -on boot - chmod 0644 /sys/kernel/debug/bluetooth/l2cap_le_max_credits - chmod 0644 /sys/kernel/debug/bluetooth/l2cap_le_default_mps - -on post-fs-data - mkdir /data/misc/dhcp 0770 dhcp system - -on property:vendor.boot_completed=1 - exec u:r:init:s0 -- /system/bin/logwrapper /system/bin/sh /vendor/bin/bluetooth_auto_detection.sh - -service dhcpcd_bt-pan /system/bin/dhcpcd -ABKL - disabled - oneshot - -service iprenew_bt-pan /system/bin/dhcpcd -n - disabled - oneshot -############################################################## # Source: device/intel/mixins/groups/audio/project-celadon/init.rc ############################################################## on boot diff --git a/caas/manifest.xml b/caas/manifest.xml index 1578972a1..87b9d2507 100644 --- a/caas/manifest.xml +++ b/caas/manifest.xml @@ -135,15 +135,6 @@ default - - android.hardware.wifi - hwbinder - 1.2 - - IWifi - default - - android.hardware.wifi.hostapd hwbinder diff --git a/caas/overlay/frameworks/base/core/res/res/values/config.xml b/caas/overlay/frameworks/base/core/res/res/values/config.xml index 9729b361f..1d32e3267 100644 --- a/caas/overlay/frameworks/base/core/res/res/values/config.xml +++ b/caas/overlay/frameworks/base/core/res/res/values/config.xml @@ -182,9 +182,6 @@ will prevent the system from entering a low power state until the dream ends. --> false - - true - 8 diff --git a/caas/overlay/packages/apps/Bluetooth/res/values/config.xml b/caas/overlay/packages/apps/Bluetooth/res/values/config.xml index 787de8619..315fa36ad 100644 --- a/caas/overlay/packages/apps/Bluetooth/res/values/config.xml +++ b/caas/overlay/packages/apps/Bluetooth/res/values/config.xml @@ -13,13 +13,16 @@ limitations under the License. --> - false - true - false - true - true - true - - - true + true + true + true + true + true + true + true + true + true + true + true + true diff --git a/caas/system.prop b/caas/system.prop index 7603d0dda..c5d94a84a 100644 --- a/caas/system.prop +++ b/caas/system.prop @@ -4,7 +4,7 @@ persist.sys.enable_rescue=false persist.sys.disable_rescue=true -persist.bluetooth.enablenewavrcp=false +persist.bluetooth.enablenewavrcp=true sys.rescue_level=0 ro.board.platform=broxton audio.safemedia.bypass=true diff --git a/caas/ueventd.rc b/caas/ueventd.rc index 664ea442f..c6e742f08 100644 --- a/caas/ueventd.rc +++ b/caas/ueventd.rc @@ -5,18 +5,13 @@ ############################################################## /dev/block/pci/pci0000:00/0000:00:*/by-name/persistent 0660 system system ############################################################## -# Source: device/intel/mixins/groups/wlan/iwlwifi/ueventd.rc -############################################################## -# WLAN GPT factory partition block device -/dev/block/*/*/*/by-name/wlan_nvm 0660 wifi system -############################################################## -# Source: device/intel/mixins/groups/bluetooth/btusb/ueventd.rc +# Source: device/intel/mixins/groups/bluetooth/auto/ueventd.rc ############################################################## # Bluetooth rfkill nodes /sys/devices/pci*/0000:00:*/usb*/*/*/*/bluetooth/hci0/rfkill* state 0660 bluetooth bluetooth /sys/devices/pci*/0000:00:*/usb*/*/*/*/bluetooth/hci0/rfkill* type 0440 bluetooth bluetooth /dev/rfkill 0660 root bluetooth -/dev/bus/usb/00*/00* 0660 bluetooth bluetooth +/dev/bus/usb/00*/00* 0660 bluetooth bluetooth ############################################################## # Source: device/intel/mixins/groups/device-specific/caas/ueventd.rc ############################################################## From 464b6258911586d8115a698adeecb6aa39f32ff4 Mon Sep 17 00:00:00 2001 From: buildslave Date: Wed, 23 Oct 2019 03:59:42 +0000 Subject: [PATCH 19/62] mixin updates Change target-level to 4 for Q Tracked-On: OAM-85223 Mixin-Reviewed-On: https://github.com/projectceladon/device-androidia-mixins/pull/415 Signed-off-by: Qiming Shi Signed-off-by: Tong Bo --- celadon_ivi/manifest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/celadon_ivi/manifest.xml b/celadon_ivi/manifest.xml index c862e43a2..87d47af9e 100644 --- a/celadon_ivi/manifest.xml +++ b/celadon_ivi/manifest.xml @@ -1,4 +1,4 @@ - + android.hardware.automotive.audiocontrol hwbinder From b3d26577feb8f0085237a4d869fd77020638e68f Mon Sep 17 00:00:00 2001 From: buildslave Date: Fri, 25 Oct 2019 11:25:11 +0000 Subject: [PATCH 20/62] mixin updates Set control_privapp_permissions to enforce New cts cases of Q require control_privapp_permissions must be enforce. Test: run cts -m CtsPermission2TestCases -t android.permission2.cts.PrivappPermissionsTest#privappPermissionsMustBeEnforced Tracked-On: OAM-86934 Mixin-Reviewed-On: https://github.com/projectceladon/device-androidia-mixins/pull/427 Signed-off-by: Xie, Shellyx --- celadon_ivi/device.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/celadon_ivi/device.mk b/celadon_ivi/device.mk index 8abf402ec..be63cd76f 100644 --- a/celadon_ivi/device.mk +++ b/celadon_ivi/device.mk @@ -301,6 +301,8 @@ PRODUCT_PACKAGES += android.hardware.keymaster@3.0-impl \ libbt-vendor PRODUCT_COPY_FILES += $(LOCAL_PATH)/manifest.xml:vendor/manifest.xml + +PRODUCT_PROPERTY_OVERRIDES += ro.control_privapp_permissions=enforce ############################################################## # Source: device/intel/mixins/groups/trusty/true/product.mk ############################################################## From dd78c32f4c9aa96380460bcc5e5d641982364d0a Mon Sep 17 00:00:00 2001 From: buildslave Date: Mon, 4 Nov 2019 10:38:11 +0000 Subject: [PATCH 21/62] mixin updates media_profiles.xml: Make changes to pass CTS CamcorderProfileTest expects "high" profile to match with max profile in each category. This patch adds changes for that. This was tested with Logitech 1080p camera which is POR for camera team. Tracked-On: OAM-86962 Mixin-Reviewed-On: https://github.com/projectceladon/device-androidia-mixins/pull/437 Signed-off-by: saranya --- .../codecs/media_profiles_1080p.xml | 56 +++++++++++++++---- .../codecs/media_profiles_1080p.xml | 56 +++++++++++++++---- .../codecs/media_profiles_1080p.xml | 56 +++++++++++++++---- 3 files changed, 138 insertions(+), 30 deletions(-) diff --git a/caas/extra_files/codecs/media_profiles_1080p.xml b/caas/extra_files/codecs/media_profiles_1080p.xml index bacc714a4..f6363eab7 100644 --- a/caas/extra_files/codecs/media_profiles_1080p.xml +++ b/caas/extra_files/codecs/media_profiles_1080p.xml @@ -246,6 +246,19 @@ channels="1" /> + + + @@ -359,16 +372,39 @@ channels="1" /> + + + + + diff --git a/celadon_ivi/extra_files/codecs/media_profiles_1080p.xml b/celadon_ivi/extra_files/codecs/media_profiles_1080p.xml index bacc714a4..f6363eab7 100644 --- a/celadon_ivi/extra_files/codecs/media_profiles_1080p.xml +++ b/celadon_ivi/extra_files/codecs/media_profiles_1080p.xml @@ -246,6 +246,19 @@ channels="1" /> + + + @@ -359,16 +372,39 @@ channels="1" /> + + + + + diff --git a/celadon_tablet/extra_files/codecs/media_profiles_1080p.xml b/celadon_tablet/extra_files/codecs/media_profiles_1080p.xml index bacc714a4..f6363eab7 100644 --- a/celadon_tablet/extra_files/codecs/media_profiles_1080p.xml +++ b/celadon_tablet/extra_files/codecs/media_profiles_1080p.xml @@ -246,6 +246,19 @@ channels="1" /> + + + @@ -359,16 +372,39 @@ channels="1" /> + + + + + From 4146eaa59b6857d2734287a20fff4dab51399f0e Mon Sep 17 00:00:00 2001 From: buildslave Date: Tue, 12 Nov 2019 06:26:57 +0000 Subject: [PATCH 22/62] mixin updates CIV: Enable virtual VT-d(vIOMMU) Add options in start_android_qcow2.sh: -device intel-iommu,device-iotlb=off \ The "device-iotlb" must off due to a QEMU issue: https://patchew.org/QEMU/20190927045838.2968-1-qi1.zhang@intel.com/ Tracked-On: OAM-88511 Mixin-Reviewed-On: https://github.com/projectceladon/device-androidia-mixins/pull/439 Signed-off-by: Qi Yadong --- caas/start_android_qcow2.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/caas/start_android_qcow2.sh b/caas/start_android_qcow2.sh index eb3b93b2c..6a24182fa 100755 --- a/caas/start_android_qcow2.sh +++ b/caas/start_android_qcow2.sh @@ -37,6 +37,7 @@ function launch_hwrender(){ -device virtio-blk-pci,drive=disk1,bootindex=1 \ -device e1000,netdev=net0 \ -netdev user,id=net0,hostfwd=tcp::5555-:5555 \ + -device intel-iommu,device-iotlb=off \ -nodefaults } From ccba4a15ef1b453c34413c406d5fff22281da1e5 Mon Sep 17 00:00:00 2001 From: "Ai, Ting A" Date: Tue, 12 Nov 2019 11:34:44 -0500 Subject: [PATCH 23/62] Enable FBE for CIV Set file_encryption to true Tracked-On: OAM-88514 Signed-off-by: Ai, Ting A --- caas/mixins.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/caas/mixins.spec b/caas/mixins.spec index 821e2143d..ce5d8989d 100755 --- a/caas/mixins.spec +++ b/caas/mixins.spec @@ -9,7 +9,7 @@ product.mk: device.mk [groups] kernel: gmin64(useprebuilt=false,src_path=kernel/lts2018, loglevel=7, interactive_governor=false, relative_sleepstates=false, modules_in_bootimg=false, external_modules=,debug_modules=, use_bcmdhd=false, use_iwlwifi=false, extmod_platform=bxt, iwl_defconfig=, cfg_path=config-lts/lts2018/bxt/android/non-embargoed, more_modules=true) disk-bus: auto -boot-arch: project-celadon(uefi_arch=x86_64,fastboot=efi,ignore_rsci=true,disable_watchdog=true,watchdog_parameters=10 30,verity_warning=false,txe_bind_root_of_trust=false,bootloader_block_size=4096,verity_mode=false,disk_encryption=false,file_encryption=false,target=caas,rpmb_simulate=true,ignore_not_applicable_reset=true,self_usb_device_mode_protocol=true,usb_storage=true,live_boot=true) +boot-arch: project-celadon(uefi_arch=x86_64,fastboot=efi,ignore_rsci=true,disable_watchdog=true,watchdog_parameters=10 30,verity_warning=false,txe_bind_root_of_trust=false,bootloader_block_size=4096,verity_mode=false,disk_encryption=false,file_encryption=true,target=caas,rpmb_simulate=true,ignore_not_applicable_reset=true,self_usb_device_mode_protocol=true,usb_storage=true,live_boot=true) sepolicy: permissive bluetooth: auto(ivi=false) audio: project-celadon From 3914e105656bed912e0d7315d4338c043f13d445 Mon Sep 17 00:00:00 2001 From: buildslave Date: Fri, 15 Nov 2019 10:46:33 +0000 Subject: [PATCH 24/62] mixin updates Enable FBE for CIV Set file_encryption to true Tracked-On: OAM-88514 Mixin-Reviewed-On: https://github.com/projectceladon/device-androidia/pull/627 Signed-off-by: Ai, Ting A --- caas/fstab | 2 +- caas/fstab.recovery | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/caas/fstab b/caas/fstab index 097cf813a..8084c6b82 100644 --- a/caas/fstab +++ b/caas/fstab @@ -9,7 +9,7 @@ # specify MF_CHECK, and must come before any filesystems that do specify MF_CHECK system /system ext4 ro,barrier=1 wait,slotselect,avb_keys=/avb/q-gsi.avbpubkey:/avb/r-gsi.avbpubkey:/avb/s-gsi.avbpubkey,avb=vbmeta,logical,first_stage_mount /dev/block/by-name/vbmeta /vbmeta emmc defaults defaults,slotselect,avb -/dev/block/by-name/userdata /data ext4 noatime,nosuid,nodev,noauto_da_alloc,errors=panic wait,check,formattable,quota,reservedsize=50m +/dev/block/by-name/userdata /data ext4 noatime,nosuid,nodev,noauto_da_alloc,errors=panic wait,check,formattable,fileencryption=aes-256-xts:aes-256-cts,quota,reservedsize=50m /dev/block/by-name/boot /boot emmc defaults defaults,slotselect,avb /dev/block/by-name/misc /misc emmc defaults defaults /dev/block/by-name/tos /tos emmc defaults defaults,slotselect,avb diff --git a/caas/fstab.recovery b/caas/fstab.recovery index d0b53b8ec..ae844b337 100644 --- a/caas/fstab.recovery +++ b/caas/fstab.recovery @@ -9,7 +9,7 @@ # specify MF_CHECK, and must come before any filesystems that do specify MF_CHECK system /system ext4 ro,barrier=1 wait,slotselect,avb_keys=/avb/q-gsi.avbpubkey:/avb/r-gsi.avbpubkey:/avb/s-gsi.avbpubkey,avb=vbmeta,logical,first_stage_mount /dev/block/by-name/vbmeta /vbmeta emmc defaults defaults,slotselect,avb -/dev/block/by-name/userdata /data ext4 noatime,nosuid,nodev,noauto_da_alloc,errors=panic wait,check,formattable +/dev/block/by-name/userdata /data ext4 noatime,nosuid,nodev,noauto_da_alloc,errors=panic wait,check,formattable,fileencryption=aes-256-xts:aes-256-cts /dev/block/by-name/boot /boot emmc defaults defaults /dev/block/by-name/misc /misc emmc defaults defaults /dev/block/by-name/tos /tos emmc defaults defaults,slotselect From c128041965b58288398039187930ea19bd7467c0 Mon Sep 17 00:00:00 2001 From: buildslave Date: Fri, 15 Nov 2019 12:43:00 +0000 Subject: [PATCH 25/62] mixin updates CIV: Enable virtual VT-d(vIOMMU) for launch_swrender() The launch script may fall-back to launch_swrender(). When launch with sw rendering, the vIOMMU is also required. Tracked-On: OAM-88532 Mixin-Reviewed-On: https://github.com/projectceladon/device-androidia-mixins/pull/442 Signed-off-by: Qi Yadong --- caas/start_android_qcow2.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/caas/start_android_qcow2.sh b/caas/start_android_qcow2.sh index 6a24182fa..55a33bc31 100755 --- a/caas/start_android_qcow2.sh +++ b/caas/start_android_qcow2.sh @@ -64,6 +64,7 @@ function launch_swrender(){ -device virtio-blk-pci,drive=disk1,bootindex=1 \ -device e1000,netdev=net0 \ -netdev user,id=net0,hostfwd=tcp::5555-:5555 \ + -device intel-iommu,device-iotlb=off \ -nodefaults } From 54f4292bef1b1daecd461f4014c06476fa20e3a9 Mon Sep 17 00:00:00 2001 From: buildslave Date: Tue, 19 Nov 2019 17:09:54 +0000 Subject: [PATCH 26/62] mixin updates Fix some treble violations There are some operations violate the treble requiements, and this introduces some selinux avc errors that cannot be fixed. Fix these violations so we can add proper sepolicy rules for this. Tracked-On: OAM-88545 Mixin-Reviewed-On: https://github.com/projectceladon/device-androidia-mixins/pull/444 Signed-off-by: ji, zhenlong z --- caas/device.mk | 6 ++++-- caas/init.rc | 8 +++++++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/caas/device.mk b/caas/device.mk index 838823279..a53ce22ee 100644 --- a/caas/device.mk +++ b/caas/device.mk @@ -95,11 +95,12 @@ PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \ android.hardware.wifi@1.0-service +# move configure files provided by intel to vendor partition. PRODUCT_COPY_FILES += \ $(INTEL_PATH_COMMON)/wlan/wpa_supplicant-common.conf:vendor/etc/wifi/wpa_supplicant.conf \ $(INTEL_PATH_COMMON)/wlan/wpa_supplicant_overlay.conf:vendor/etc/wifi/wpa_supplicant_overlay.conf \ $(INTEL_PATH_COMMON)/wlan/p2p_supplicant_overlay.conf:vendor/etc/wifi/p2p_supplicant_overlay.conf \ - $(INTEL_PATH_COMMON)/wlan/wlan.conf:system/etc/modprobe.d/wlan.conf \ + $(INTEL_PATH_COMMON)/wlan/wlan.conf:vendor/etc/modprobe.d/wlan.conf \ frameworks/native/data/etc/android.hardware.wifi.xml:vendor/etc/permissions/android.hardware.wifi.xml \ frameworks/native/data/etc/android.hardware.wifi.direct.xml:vendor/etc/permissions/android.hardware.wifi.direct.xml @@ -364,8 +365,9 @@ PRODUCT_PACKAGES += ufo_prebuilts # i915 firmwares $(foreach fw,$(I915_FW),$(eval PRODUCT_PACKAGES += $(notdir $(fw)))) +# move configure files provided by intel to vendor partition PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/extra_files/graphics/drirc:system/etc/drirc + $(LOCAL_PATH)/extra_files/graphics/drirc:vendor/etc/drirc # HWComposer IA diff --git a/caas/init.rc b/caas/init.rc index c38c554c6..570f1a1bb 100644 --- a/caas/init.rc +++ b/caas/init.rc @@ -639,7 +639,13 @@ on init start vendor.aafd on fs - exec u:r:init:s0 -- /system/bin/logwrapper /system/bin/sh /vendor/bin/auto_detection.sh + exec - root root -- /vendor/bin/logwrapper /vendor/bin/sh /vendor/bin/auto_detection.sh + +# previously these properties are set in auto_detection.sh, however, these properties are +# of exported_default_prop which can only be set by init or vendor_init with treble +# enabled, so we have to hardcod these properties here. + setprop ro.hardware.hwcomposer intel + setprop ro.hardware.gralloc intel ############################################################## # Source: device/intel/mixins/groups/suspend/never/init.rc ############################################################## From 4ba98f2aa5cd95bf27beff1677adbc17457ad258 Mon Sep 17 00:00:00 2001 From: buildslave Date: Wed, 20 Nov 2019 03:46:53 +0000 Subject: [PATCH 27/62] mixin updates [BT] Add BT usb vendor ID and product ID As part of BT enablement, added vendor and product id to usb-host on boot time. Tracked-On: OAM-88567 Mixin-Reviewed-On: https://github.com/projectceladon/device-androidia-mixins/pull/448 Signed-off-by: Raveendra Babu Chennakesavulu --- caas/start_android_qcow2.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/caas/start_android_qcow2.sh b/caas/start_android_qcow2.sh index 55a33bc31..b72aabc54 100755 --- a/caas/start_android_qcow2.sh +++ b/caas/start_android_qcow2.sh @@ -27,6 +27,7 @@ function launch_hwrender(){ -global PIIX4_PM.disable_s3=1 -global PIIX4_PM.disable_s4=1 \ -cpu host \ -device qemu-xhci,id=xhci,addr=0x8 \ + -device usb-host,vendorid=0x8087,productid=0x0a2b \ -device usb-mouse \ -device usb-kbd \ -drive file=$ovmf_file,format=raw,if=pflash \ From 8a0a5661183a80528cc189e787518bd4bfb390a2 Mon Sep 17 00:00:00 2001 From: "ji, zhenlong z" Date: Tue, 19 Nov 2019 14:19:07 +0800 Subject: [PATCH 28/62] Enable selinux for caas Tracked-On: OAM-88583 Signed-off-by: ji, zhenlong z --- caas/mixins.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/caas/mixins.spec b/caas/mixins.spec index ce5d8989d..e7282f756 100755 --- a/caas/mixins.spec +++ b/caas/mixins.spec @@ -10,7 +10,7 @@ product.mk: device.mk kernel: gmin64(useprebuilt=false,src_path=kernel/lts2018, loglevel=7, interactive_governor=false, relative_sleepstates=false, modules_in_bootimg=false, external_modules=,debug_modules=, use_bcmdhd=false, use_iwlwifi=false, extmod_platform=bxt, iwl_defconfig=, cfg_path=config-lts/lts2018/bxt/android/non-embargoed, more_modules=true) disk-bus: auto boot-arch: project-celadon(uefi_arch=x86_64,fastboot=efi,ignore_rsci=true,disable_watchdog=true,watchdog_parameters=10 30,verity_warning=false,txe_bind_root_of_trust=false,bootloader_block_size=4096,verity_mode=false,disk_encryption=false,file_encryption=true,target=caas,rpmb_simulate=true,ignore_not_applicable_reset=true,self_usb_device_mode_protocol=true,usb_storage=true,live_boot=true) -sepolicy: permissive +sepolicy: enforcing bluetooth: auto(ivi=false) audio: project-celadon vendor-partition: true(partition_size=600,partition_name=vendor) From 997d9254a3d43e84a90a406a7d8c636ef10b3fca Mon Sep 17 00:00:00 2001 From: buildslave Date: Wed, 20 Nov 2019 06:50:43 +0000 Subject: [PATCH 29/62] mixin updates Enable selinux for caas Tracked-On: OAM-88583 Mixin-Reviewed-On: https://github.com/projectceladon/device-androidia/pull/635 Signed-off-by: ji, zhenlong z --- caas/AndroidBoard.mk | 2 +- caas/BoardConfig.mk | 8 +------- caas/device.mk | 2 +- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/caas/AndroidBoard.mk b/caas/AndroidBoard.mk index 70da774e3..40d1a1c67 100644 --- a/caas/AndroidBoard.mk +++ b/caas/AndroidBoard.mk @@ -460,7 +460,7 @@ kernel: $(LOCAL_KERNEL_PATH)/copy_modules $(PRODUCT_OUT)/kernel endif ############################################################## -# Source: device/intel/mixins/groups/sepolicy/permissive/AndroidBoard.mk +# Source: device/intel/mixins/groups/sepolicy/enforcing/AndroidBoard.mk ############################################################## include $(CLEAR_VARS) LOCAL_MODULE := sepolicy-areq-checker diff --git a/caas/BoardConfig.mk b/caas/BoardConfig.mk index 877fb9778..eec4fa895 100644 --- a/caas/BoardConfig.mk +++ b/caas/BoardConfig.mk @@ -188,13 +188,7 @@ BOARD_KERNEL_CMDLINE += \ BOARD_SEPOLICY_M4DEFS += module_kernel=true BOARD_SEPOLICY_DIRS += $(INTEL_PATH_SEPOLICY)/kernel ############################################################## -# Source: device/intel/mixins/groups/sepolicy/permissive/BoardConfig.mk.1 -############################################################## -# start kernel in permissive mode, this way we don't -# need 'setenforce 0' from init.rc files -BOARD_KERNEL_CMDLINE += enforcing=0 androidboot.selinux=permissive -############################################################## -# Source: device/intel/mixins/groups/sepolicy/permissive/BoardConfig.mk +# Source: device/intel/mixins/groups/sepolicy/enforcing/BoardConfig.mk ############################################################## # SELinux Policy BOARD_SEPOLICY_DIRS += $(INTEL_PATH_SEPOLICY) diff --git a/caas/device.mk b/caas/device.mk index a53ce22ee..3797083cd 100644 --- a/caas/device.mk +++ b/caas/device.mk @@ -118,7 +118,7 @@ KERNEL_MODULES_ROOT_PATH ?= vendor/lib/modules KERNEL_MODULES_ROOT ?= $(KERNEL_MODULES_ROOT_PATH) PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.vendor.boot.moduleslocation=/$(KERNEL_MODULES_ROOT_PATH) ############################################################## -# Source: device/intel/mixins/groups/sepolicy/permissive/product.mk +# Source: device/intel/mixins/groups/sepolicy/enforcing/product.mk ############################################################## PRODUCT_PACKAGES += sepolicy-areq-checker ############################################################## From c9d202809dd46a9ddfa270494c58ea04c70946ab Mon Sep 17 00:00:00 2001 From: buildslave Date: Thu, 21 Nov 2019 05:22:40 +0000 Subject: [PATCH 30/62] mixin updates Enable usb camera in VM Assigned logitech 1080p(C922, C920) USB devices to VM Tracked-On: OAM-88591 Mixin-Reviewed-On: https://github.com/projectceladon/device-androidia-mixins/pull/449 Signed-off-by: Jeevaka Prabu Badrappan --- caas/start_android_qcow2.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/caas/start_android_qcow2.sh b/caas/start_android_qcow2.sh index b72aabc54..bb27659cb 100755 --- a/caas/start_android_qcow2.sh +++ b/caas/start_android_qcow2.sh @@ -28,6 +28,8 @@ function launch_hwrender(){ -cpu host \ -device qemu-xhci,id=xhci,addr=0x8 \ -device usb-host,vendorid=0x8087,productid=0x0a2b \ + -device usb-host,vendorid=0x046d,productid=0x082d \ + -device usb-host,vendorid=0x046d,productid=0x085c \ -device usb-mouse \ -device usb-kbd \ -drive file=$ovmf_file,format=raw,if=pflash \ @@ -55,6 +57,8 @@ function launch_swrender(){ -global PIIX4_PM.disable_s3=1 -global PIIX4_PM.disable_s4=1 \ -cpu host \ -device qemu-xhci,id=xhci,addr=0x8 \ + -device usb-host,vendorid=0x046d,productid=0x082d \ + -device usb-host,vendorid=0x046d,productid=0x085c \ -device usb-mouse \ -device usb-kbd \ -drive file=$ovmf_file,format=raw,if=pflash \ From 77ac54bad0b5ec692d87ab4f988d2c31a11280de Mon Sep 17 00:00:00 2001 From: buildslave Date: Fri, 22 Nov 2019 11:06:19 +0000 Subject: [PATCH 31/62] mixin updates [CIV] Enable USB based Touch devices Added eGalax7200, GeChic and ELO touch devices as a passthrough devices for VM. Tracked-On: OAM-88602 Mixin-Reviewed-On: https://github.com/projectceladon/device-androidia-mixins/pull/451 Signed-off-by: Jaikrishna Nemallapudi --- caas/start_android_qcow2.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/caas/start_android_qcow2.sh b/caas/start_android_qcow2.sh index bb27659cb..1b6f5dc36 100755 --- a/caas/start_android_qcow2.sh +++ b/caas/start_android_qcow2.sh @@ -27,6 +27,10 @@ function launch_hwrender(){ -global PIIX4_PM.disable_s3=1 -global PIIX4_PM.disable_s4=1 \ -cpu host \ -device qemu-xhci,id=xhci,addr=0x8 \ + -device usb-host,vendorid=0x03eb,productid=0x8a6e \ + -device usb-host,vendorid=0x0eef,productid=0x7200 \ + -device usb-host,vendorid=0x222a,productid=0x0141 \ + -device usb-host,vendorid=0x222a,productid=0x0088 \ -device usb-host,vendorid=0x8087,productid=0x0a2b \ -device usb-host,vendorid=0x046d,productid=0x082d \ -device usb-host,vendorid=0x046d,productid=0x085c \ @@ -57,6 +61,10 @@ function launch_swrender(){ -global PIIX4_PM.disable_s3=1 -global PIIX4_PM.disable_s4=1 \ -cpu host \ -device qemu-xhci,id=xhci,addr=0x8 \ + -device usb-host,vendorid=0x03eb,productid=0x8a6e \ + -device usb-host,vendorid=0x0eef,productid=0x7200 \ + -device usb-host,vendorid=0x222a,productid=0x0141 \ + -device usb-host,vendorid=0x222a,productid=0x0088 \ -device usb-host,vendorid=0x046d,productid=0x082d \ -device usb-host,vendorid=0x046d,productid=0x085c \ -device usb-mouse \ From d5490b2b733b3950de6012bbae1a4d0e52cdb056 Mon Sep 17 00:00:00 2001 From: Jeevaka Prabu Badrappan Date: Sun, 24 Nov 2019 11:22:03 +0530 Subject: [PATCH 32/62] caas: Set media profile name in codecs mixins to support 1080p Set media profiles file name to media_profiles_1080p.xml to support 720p and 1080p video recording. Tracked-On: OAM-88630 Signed-off-by: Jeevaka Prabu Badrappan --- caas/mixins.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/caas/mixins.spec b/caas/mixins.spec index e7282f756..c638e5658 100755 --- a/caas/mixins.spec +++ b/caas/mixins.spec @@ -29,7 +29,7 @@ ethernet: dhcp camera-ext: ext-camera-only rfkill: true(force_disable=) wlan: auto -codecs: configurable(hw_ve_h265=true, hw_vd_vp9=true, hw_vd_mp2=true, hw_vd_vc1=false, platform=bxt) +codecs: configurable(hw_ve_h265=true, hw_vd_vp9=true, hw_vd_mp2=true, hw_vd_vc1=false, platform=bxt, profile_file=media_profiles_1080p.xml) codec2: true usb: host usb-gadget: configfs(usb_config=adb,mtp_adb_pid=0x0a5f,ptp_adb_pid=0x0a61,rndis_pid=0x0a62,rndis_adb_pid=0x0a63,bcdDevice=0x0,bcdUSB=0x200,controller=dwc3.0.auto,f_acm=false,f_dvc_trace=true,dvctrace_source_dev=dvcith-0-msc0) From 4d1e6f16c05ce7b78d4e9926cdcf898976367316 Mon Sep 17 00:00:00 2001 From: buildslave Date: Tue, 26 Nov 2019 13:07:02 +0000 Subject: [PATCH 33/62] mixin updates Camera: Add support for 4k@30,HD/FHD@60 resolution Adding support for 4k UHD@30, 4k DCI@30fps, 1080p@60, 720p@60 resolutions. All 4k@30 or FHD/HD@60 fps cameras are supported through USB 3.x standard. caas: Change order of usb host device pass through Camera not working properly after touch screen devices are passed to VM. Fix the issue by moving the USB camera pass through to top of the list. caas: Set media profile name in codecs mixins to support 1080p Set media profiles file name to media_profiles_1080p.xml to support 720p and 1080p video recording. Tracked-On: OAM-88590 Tracked-On: OAM-88630 Tracked-On: OAM-88637 Mixin-Reviewed-On: https://github.com/projectceladon/device-androidia-mixins/pull/450 Mixin-Reviewed-On: https://github.com/projectceladon/device-androidia-mixins/pull/453 Mixin-Reviewed-On: https://github.com/projectceladon/device-androidia/pull/644 Signed-off-by: Jeevaka Prabu Badrappan Signed-off-by: Muhammad Aksar --- caas/device.mk | 2 +- caas/extra_files/camera-ext/external_camera_config.xml | 6 ++++-- caas/start_android_qcow2.sh | 8 ++++---- .../extra_files/camera-ext/external_camera_config.xml | 6 ++++-- .../extra_files/camera-ext/external_camera_config.xml | 6 ++++-- 5 files changed, 17 insertions(+), 11 deletions(-) diff --git a/caas/device.mk b/caas/device.mk index 3797083cd..e0557f931 100644 --- a/caas/device.mk +++ b/caas/device.mk @@ -454,7 +454,7 @@ PRODUCT_COPY_FILES += \ frameworks/av/media/libstagefright/data/media_codecs_google_video.xml:vendor/etc/media_codecs_google_video.xml \ $(LOCAL_PATH)/extra_files/codecs/media_codecs.xml:vendor/etc/media_codecs.xml \ $(LOCAL_PATH)/extra_files/codecs/mfx_omxil_core.conf:vendor/etc/mfx_omxil_core.conf \ - $(LOCAL_PATH)/extra_files/codecs/media_profiles.xml:vendor/etc/media_profiles_V1_0.xml + $(LOCAL_PATH)/extra_files/codecs/media_profiles_1080p.xml:vendor/etc/media_profiles_V1_0.xml PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/extra_files/codecs/media_codecs_performance_bxt.xml:vendor/etc/media_codecs_performance.xml diff --git a/caas/extra_files/camera-ext/external_camera_config.xml b/caas/extra_files/camera-ext/external_camera_config.xml index 1f9be47b9..72597369f 100644 --- a/caas/extra_files/camera-ext/external_camera_config.xml +++ b/caas/extra_files/camera-ext/external_camera_config.xml @@ -39,8 +39,10 @@ - - + + + + diff --git a/caas/start_android_qcow2.sh b/caas/start_android_qcow2.sh index 1b6f5dc36..953f72121 100755 --- a/caas/start_android_qcow2.sh +++ b/caas/start_android_qcow2.sh @@ -27,13 +27,13 @@ function launch_hwrender(){ -global PIIX4_PM.disable_s3=1 -global PIIX4_PM.disable_s4=1 \ -cpu host \ -device qemu-xhci,id=xhci,addr=0x8 \ + -device usb-host,vendorid=0x046d,productid=0x082d \ + -device usb-host,vendorid=0x046d,productid=0x085c \ -device usb-host,vendorid=0x03eb,productid=0x8a6e \ -device usb-host,vendorid=0x0eef,productid=0x7200 \ -device usb-host,vendorid=0x222a,productid=0x0141 \ -device usb-host,vendorid=0x222a,productid=0x0088 \ -device usb-host,vendorid=0x8087,productid=0x0a2b \ - -device usb-host,vendorid=0x046d,productid=0x082d \ - -device usb-host,vendorid=0x046d,productid=0x085c \ -device usb-mouse \ -device usb-kbd \ -drive file=$ovmf_file,format=raw,if=pflash \ @@ -61,12 +61,12 @@ function launch_swrender(){ -global PIIX4_PM.disable_s3=1 -global PIIX4_PM.disable_s4=1 \ -cpu host \ -device qemu-xhci,id=xhci,addr=0x8 \ + -device usb-host,vendorid=0x046d,productid=0x082d \ + -device usb-host,vendorid=0x046d,productid=0x085c \ -device usb-host,vendorid=0x03eb,productid=0x8a6e \ -device usb-host,vendorid=0x0eef,productid=0x7200 \ -device usb-host,vendorid=0x222a,productid=0x0141 \ -device usb-host,vendorid=0x222a,productid=0x0088 \ - -device usb-host,vendorid=0x046d,productid=0x082d \ - -device usb-host,vendorid=0x046d,productid=0x085c \ -device usb-mouse \ -device usb-kbd \ -drive file=$ovmf_file,format=raw,if=pflash \ diff --git a/celadon_ivi/extra_files/camera-ext/external_camera_config.xml b/celadon_ivi/extra_files/camera-ext/external_camera_config.xml index 1f9be47b9..72597369f 100644 --- a/celadon_ivi/extra_files/camera-ext/external_camera_config.xml +++ b/celadon_ivi/extra_files/camera-ext/external_camera_config.xml @@ -39,8 +39,10 @@ - - + + + + diff --git a/celadon_tablet/extra_files/camera-ext/external_camera_config.xml b/celadon_tablet/extra_files/camera-ext/external_camera_config.xml index 1f9be47b9..72597369f 100644 --- a/celadon_tablet/extra_files/camera-ext/external_camera_config.xml +++ b/celadon_tablet/extra_files/camera-ext/external_camera_config.xml @@ -39,8 +39,10 @@ - - + + + + From 3a0692b82122f4c8b3d003d38196306c205fc012 Mon Sep 17 00:00:00 2001 From: buildslave Date: Tue, 3 Dec 2019 05:56:30 +0000 Subject: [PATCH 34/62] mixin updates Enable Virgl(Virtual 3D GPU) This changes help to support Virgl(Virtual 3D GPU) for guest virtual machines. Tracked-On: OAM-88714 Mixin-Reviewed-On: https://github.com/projectceladon/device-androidia-mixins/pull/454 Signed-off-by: Jin, Zhi --- caas/BoardConfig.mk | 7 ++++--- .../lts2018/bxt/android/non-embargoed/caas_diffconfig | 2 ++ caas/device.mk | 8 +++++++- caas/extra_files/graphics/auto_hal.in | 7 ++++++- .../lts2018/bxt/android/non-embargoed/caas_diffconfig | 2 ++ .../lts2018/bxt/android/non-embargoed/caas_diffconfig | 2 ++ 6 files changed, 23 insertions(+), 5 deletions(-) diff --git a/caas/BoardConfig.mk b/caas/BoardConfig.mk index eec4fa895..c7e20f5b6 100644 --- a/caas/BoardConfig.mk +++ b/caas/BoardConfig.mk @@ -384,21 +384,22 @@ BOARD_KERNEL_CMDLINE += vga=current i915.modeset=1 drm.atomic=1 i915.nuclear_pag USE_OPENGL_RENDERER := true NUM_FRAMEBUFFER_SURFACE_BUFFERS := 3 USE_INTEL_UFO_DRIVER := false -BOARD_GPU_DRIVERS := i965 +BOARD_GPU_DRIVERS := i965 virgl BOARD_USE_CUSTOMIZED_MESA := true # System's VSYNC phase offsets in nanoseconds VSYNC_EVENT_PHASE_OFFSET_NS := 7500000 SF_VSYNC_EVENT_PHASE_OFFSET_NS := 3000000 -BOARD_GPU_DRIVERS ?= i965 swrast +BOARD_GPU_DRIVERS ?= i965 swrast virgl ifneq ($(strip $(BOARD_GPU_DRIVERS)),) TARGET_HARDWARE_3D := true TARGET_USES_HWC2 := true endif +BOARD_USES_DRM_HWCOMPOSER := true +BOARD_USES_IA_PLANNER := true -BOARD_USES_DRM_HWCOMPOSER := false BOARD_USES_IA_HWCOMPOSER := true BOARD_USES_MINIGBM := true diff --git a/caas/config-lts/lts2018/bxt/android/non-embargoed/caas_diffconfig b/caas/config-lts/lts2018/bxt/android/non-embargoed/caas_diffconfig index f63ae1764..7c4210b8e 100644 --- a/caas/config-lts/lts2018/bxt/android/non-embargoed/caas_diffconfig +++ b/caas/config-lts/lts2018/bxt/android/non-embargoed/caas_diffconfig @@ -2,6 +2,8 @@ CONFIG_VIRTIO=y CONFIG_VIRTIO_PCI=y CONFIG_VIRTIO_NET=y CONFIG_VIRTIO_BLK=y +CONFIG_DRM_VIRTIO_GPU=y +CONFIG_SW_SYNC=y CONFIG_MOUSE_PS2=y CONFIG_MOUSE_PS2_VMMOUSE=y CONFIG_DRM_QXL=y diff --git a/caas/device.mk b/caas/device.mk index e0557f931..4bc2eeee5 100644 --- a/caas/device.mk +++ b/caas/device.mk @@ -369,6 +369,12 @@ $(foreach fw,$(I915_FW),$(eval PRODUCT_PACKAGES += $(notdir $(fw)))) PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/extra_files/graphics/drirc:vendor/etc/drirc +# DRM HWComposer +PRODUCT_PACKAGES += \ + hwcomposer.drm_minigbm + +# PRODUCT_PROPERTY_OVERRIDES += \ +# ro.hardware.hwcomposer=drm # HWComposer IA PRODUCT_PACKAGES += \ @@ -386,12 +392,12 @@ PRODUCT_COPY_FILES += $(INTEL_HWC_CONFIG)/hwc_display.ini:$(TARGET_COPY_OUT_VEND PRODUCT_COPY_FILES += $(INTEL_HWC_CONFIG)/hwc_display.kvm.ini:$(TARGET_COPY_OUT_VENDOR)/etc/hwc_display.kvm.ini endif - # Mini gbm # PRODUCT_PROPERTY_OVERRIDES += \ # ro.hardware.gralloc=$(TARGET_GFX_INTEL) PRODUCT_PACKAGES += \ + gralloc.minigbm \ gralloc.$(TARGET_GFX_INTEL) diff --git a/caas/extra_files/graphics/auto_hal.in b/caas/extra_files/graphics/auto_hal.in index 1225c5619..7c2fe2d68 100644 --- a/caas/extra_files/graphics/auto_hal.in +++ b/caas/extra_files/graphics/auto_hal.in @@ -1,5 +1,5 @@ auto_hal() { -case "$(cat /proc/fb | grep inteldrmfb)" in +case "$(cat /proc/fb)" in *inteldrmfb) echo "intel" setprop ro.hardware.hwcomposer intel @@ -13,6 +13,11 @@ case "$(cat /proc/fb | grep inteldrmfb)" in ;; esac ;; + *virtiodrmfb) + echo "virtio-gpu" + setprop ro.hardware.hwcomposer drm_minigbm + setprop ro.hardware.gralloc minigbm + ;; *) echo "sw rendering" setprop ro.hardware.egl swiftshader diff --git a/celadon_ivi/config-lts/lts2018/bxt/android/non-embargoed/caas_diffconfig b/celadon_ivi/config-lts/lts2018/bxt/android/non-embargoed/caas_diffconfig index f63ae1764..7c4210b8e 100644 --- a/celadon_ivi/config-lts/lts2018/bxt/android/non-embargoed/caas_diffconfig +++ b/celadon_ivi/config-lts/lts2018/bxt/android/non-embargoed/caas_diffconfig @@ -2,6 +2,8 @@ CONFIG_VIRTIO=y CONFIG_VIRTIO_PCI=y CONFIG_VIRTIO_NET=y CONFIG_VIRTIO_BLK=y +CONFIG_DRM_VIRTIO_GPU=y +CONFIG_SW_SYNC=y CONFIG_MOUSE_PS2=y CONFIG_MOUSE_PS2_VMMOUSE=y CONFIG_DRM_QXL=y diff --git a/celadon_tablet/config-lts/lts2018/bxt/android/non-embargoed/caas_diffconfig b/celadon_tablet/config-lts/lts2018/bxt/android/non-embargoed/caas_diffconfig index f63ae1764..7c4210b8e 100644 --- a/celadon_tablet/config-lts/lts2018/bxt/android/non-embargoed/caas_diffconfig +++ b/celadon_tablet/config-lts/lts2018/bxt/android/non-embargoed/caas_diffconfig @@ -2,6 +2,8 @@ CONFIG_VIRTIO=y CONFIG_VIRTIO_PCI=y CONFIG_VIRTIO_NET=y CONFIG_VIRTIO_BLK=y +CONFIG_DRM_VIRTIO_GPU=y +CONFIG_SW_SYNC=y CONFIG_MOUSE_PS2=y CONFIG_MOUSE_PS2_VMMOUSE=y CONFIG_DRM_QXL=y From 20867241b2f206201b5fa0e941fcd14c7d3611e5 Mon Sep 17 00:00:00 2001 From: zhezhu Date: Fri, 15 Nov 2019 18:13:21 +0800 Subject: [PATCH 35/62] mixin updates for mediasdk_omx_il Tracked-On: https://jira.devtools.intel.com/browse/OAM-88548 --- caas/mixins.spec | 2 +- celadon_ivi/mixins.spec | 2 +- celadon_tablet/mixins.spec | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/caas/mixins.spec b/caas/mixins.spec index c638e5658..e14195c2f 100755 --- a/caas/mixins.spec +++ b/caas/mixins.spec @@ -22,7 +22,7 @@ cpu-arch: x86 allow-missing-dependencies: true dexpreopt: true pstore: false -media: auto(add_sw_msdk=false, opensource_msdk=true) +media: auto(add_sw_msdk=false, opensource_msdk=true, opensource_msdk_omx_il=true) graphics: auto(gen9+=true,hwc2=true,vulkan=true,drmhwc=false,minigbm=true,gralloc1=true,enable_guc=false) storage: sdcard-mmc0-usb-sd(adoptablesd=true,adoptableusb=true) ethernet: dhcp diff --git a/celadon_ivi/mixins.spec b/celadon_ivi/mixins.spec index 89763eb8e..1e7bf5612 100755 --- a/celadon_ivi/mixins.spec +++ b/celadon_ivi/mixins.spec @@ -23,7 +23,7 @@ allow-missing-dependencies: true dexpreopt: true pstore: ram_dummy(address=0x50000000,size=0x400000,record_size=0x4000,console_size=0x200000,ftrace_size=0x2000,dump_oops=1) bugreport: true -media: mesa(add_sw_msdk=false, opensource_msdk=true) +media: mesa(add_sw_msdk=false, opensource_msdk=true, opensource_msdk_omx_il=true) graphics: mesa(gen9+=true,hwc2=true,vulkan=true,drmhwc=false,minigbm=true,gralloc1=true,enable_guc=false) storage: sdcard-mmc0-usb-sd(adoptablesd=true,adoptableusb=true) ethernet: dhcp diff --git a/celadon_tablet/mixins.spec b/celadon_tablet/mixins.spec index 7616a2740..df8dcc908 100755 --- a/celadon_tablet/mixins.spec +++ b/celadon_tablet/mixins.spec @@ -22,7 +22,7 @@ cpu-arch: x86 allow-missing-dependencies: true dexpreopt: true pstore: ram_dummy(address=0x50000000,size=0x400000,record_size=0x4000,console_size=0x200000,ftrace_size=0x2000,dump_oops=1) -media: mesa(add_sw_msdk=false, opensource_msdk=true) +media: mesa(add_sw_msdk=false, opensource_msdk=true, opensource_msdk_omx_il=true) graphics: mesa(gen9+=true,hwc2=true,vulkan=true,drmhwc=false,minigbm=true,gralloc1=true,enable_guc=false) storage: sdcard-mmc0-usb-sd(adoptablesd=true,adoptableusb=true) ethernet: dhcp From a9dd34bbd0a1e2b6702c1db2b81e88defe551f17 Mon Sep 17 00:00:00 2001 From: buildslave Date: Mon, 9 Dec 2019 08:55:43 +0000 Subject: [PATCH 36/62] mixin updates Enable Opensource MediaSDK OpenMAX plugin mixin updates for mediasdk_omx_il Tracked-On: OAM-88548 Mixin-Reviewed-On: https://github.com/projectceladon/device-androidia-mixins/pull/446 Mixin-Reviewed-On: https://github.com/projectceladon/device-androidia/pull/632 --- celadon_ivi/device.mk | 2 ++ celadon_tablet/device.mk | 2 ++ 2 files changed, 4 insertions(+) diff --git a/celadon_ivi/device.mk b/celadon_ivi/device.mk index be63cd76f..ff4575fc0 100644 --- a/celadon_ivi/device.mk +++ b/celadon_ivi/device.mk @@ -394,6 +394,8 @@ endif BOARD_HAVE_MEDIASDK_OPEN_SOURCE := true +BOARD_HAVE_OMX_SRC := true + PRODUCT_PACKAGES += \ libpciaccess ############################################################## diff --git a/celadon_tablet/device.mk b/celadon_tablet/device.mk index 3e7e2c09c..22060e92f 100644 --- a/celadon_tablet/device.mk +++ b/celadon_tablet/device.mk @@ -405,6 +405,8 @@ endif BOARD_HAVE_MEDIASDK_OPEN_SOURCE := true +BOARD_HAVE_OMX_SRC := true + PRODUCT_PACKAGES += \ libpciaccess ############################################################## From 19676a68cff2c717457b9a5c8ce5c2450d88f3b7 Mon Sep 17 00:00:00 2001 From: buildslave Date: Wed, 11 Dec 2019 09:31:41 +0000 Subject: [PATCH 37/62] mixin updates CIV: check nested VT in launch script Check nested VT status before launch Guest OS. If nested VT is not enabled, exit script with error hint. Tracked-On: OAM-88755 Mixin-Reviewed-On: https://github.com/projectceladon/device-androidia-mixins/pull/460 Signed-off-by: Qi Yadong --- caas/start_android_qcow2.sh | 114 ++++++++++++++++-------------------- 1 file changed, 52 insertions(+), 62 deletions(-) diff --git a/caas/start_android_qcow2.sh b/caas/start_android_qcow2.sh index 953f72121..9a6873c7c 100755 --- a/caas/start_android_qcow2.sh +++ b/caas/start_android_qcow2.sh @@ -1,84 +1,73 @@ #!/bin/bash -g_file="/sys/bus/pci/devices/0000:00:02.0/4ec1ff92-81d7-11e9-aed4-5bf6a9a2bb0a" +work_dir=$PWD +caas_image=$work_dir/android.qcow2 + ovmf_file="./OVMF.fd" [ ! -f $ovmf_file ] && ovmf_file="/usr/share/qemu/OVMF.fd" +GVTg_DEV_PATH="/sys/bus/pci/devices/0000:00:02.0" +GVTg_VGPU_UUID="4ec1ff92-81d7-11e9-aed4-5bf6a9a2bb0a" function setup_vgpu(){ res=0 - if [ ! -d $g_file ]; then + if [ ! -d $GVTg_DEV_PATH/$GVTg_VGPU_UUID ]; then echo "Creating VGPU..." - sudo sh -c "echo 4ec1ff92-81d7-11e9-aed4-5bf6a9a2bb0a > /sys/bus/pci/devices/0000:00:02.0/mdev_supported_types/i915-GVTg_V5_8/create" + sudo sh -c "echo $GVTg_VGPU_UUID > $GVTg_DEV_PATH/mdev_supported_types/i915-GVTg_V5_8/create" res=$? fi return $res } +common_options="\ + -m 2048 -smp 2 -M q35 \ + -name caas-vm \ + -enable-kvm \ + -vga none \ + -display gtk,gl=on \ + -k en-us \ + -machine kernel_irqchip=off \ + -global PIIX4_PM.disable_s3=1 -global PIIX4_PM.disable_s4=1 \ + -cpu host \ + -device qemu-xhci,id=xhci,addr=0x8 \ + -device usb-host,vendorid=0x046d,productid=0x082d \ + -device usb-host,vendorid=0x046d,productid=0x085c \ + -device usb-host,vendorid=0x03eb,productid=0x8a6e \ + -device usb-host,vendorid=0x0eef,productid=0x7200 \ + -device usb-host,vendorid=0x222a,productid=0x0141 \ + -device usb-host,vendorid=0x222a,productid=0x0088 \ + -device usb-host,vendorid=0x8087,productid=0x0a2b \ + -device usb-mouse \ + -device usb-kbd \ + -drive file=$ovmf_file,format=raw,if=pflash \ + -chardev socket,id=charserial0,path=./kernel-console,server,nowait \ + -device isa-serial,chardev=charserial0,id=serial0 \ + -device intel-hda -device hda-duplex \ + -drive file=$caas_image,if=none,id=disk1 \ + -device virtio-blk-pci,drive=disk1,bootindex=1 \ + -device e1000,netdev=net0 \ + -netdev user,id=net0,hostfwd=tcp::5555-:5555 \ + -device intel-iommu,device-iotlb=off \ + -nodefaults +" + function launch_hwrender(){ qemu-system-x86_64 \ - -m 2048 -smp 2 -M q35 \ - -name caas-vm \ - -enable-kvm \ - -vga none \ - -display gtk,gl=on \ - -device vfio-pci,sysfsdev=/sys/bus/pci/devices/0000:00:02.0/4ec1ff92-81d7-11e9-aed4-5bf6a9a2bb0a,display=on,x-igd-opregion=on \ - -k en-us \ - -machine kernel_irqchip=off \ - -global PIIX4_PM.disable_s3=1 -global PIIX4_PM.disable_s4=1 \ - -cpu host \ - -device qemu-xhci,id=xhci,addr=0x8 \ - -device usb-host,vendorid=0x046d,productid=0x082d \ - -device usb-host,vendorid=0x046d,productid=0x085c \ - -device usb-host,vendorid=0x03eb,productid=0x8a6e \ - -device usb-host,vendorid=0x0eef,productid=0x7200 \ - -device usb-host,vendorid=0x222a,productid=0x0141 \ - -device usb-host,vendorid=0x222a,productid=0x0088 \ - -device usb-host,vendorid=0x8087,productid=0x0a2b \ - -device usb-mouse \ - -device usb-kbd \ - -drive file=$ovmf_file,format=raw,if=pflash \ - -chardev socket,id=charserial0,path=./kernel-console,server,nowait \ - -device isa-serial,chardev=charserial0,id=serial0 \ - -device intel-hda -device hda-duplex \ - -drive file=./android.qcow2,if=none,id=disk1 \ - -device virtio-blk-pci,drive=disk1,bootindex=1 \ - -device e1000,netdev=net0 \ - -netdev user,id=net0,hostfwd=tcp::5555-:5555 \ - -device intel-iommu,device-iotlb=off \ - -nodefaults + -device vfio-pci,sysfsdev=$GVTg_DEV_PATH/$GVTg_VGPU_UUID,display=on,x-igd-opregion=on \ + $common_options } function launch_swrender(){ qemu-system-x86_64 \ - -m 2048 -smp 2 -M q35 \ - -name caas-vm \ - -enable-kvm \ - -k en-us \ - -vga none \ - -display gtk,gl=on \ -device qxl-vga,xres=1280,yres=720 \ - -machine kernel_irqchip=off \ - -global PIIX4_PM.disable_s3=1 -global PIIX4_PM.disable_s4=1 \ - -cpu host \ - -device qemu-xhci,id=xhci,addr=0x8 \ - -device usb-host,vendorid=0x046d,productid=0x082d \ - -device usb-host,vendorid=0x046d,productid=0x085c \ - -device usb-host,vendorid=0x03eb,productid=0x8a6e \ - -device usb-host,vendorid=0x0eef,productid=0x7200 \ - -device usb-host,vendorid=0x222a,productid=0x0141 \ - -device usb-host,vendorid=0x222a,productid=0x0088 \ - -device usb-mouse \ - -device usb-kbd \ - -drive file=$ovmf_file,format=raw,if=pflash \ - -chardev socket,id=charserial0,path=./kernel-console,server,nowait \ - -device isa-serial,chardev=charserial0,id=serial0 \ - -device intel-hda -device hda-duplex \ - -drive file=./android.qcow2,if=none,id=disk1 \ - -device virtio-blk-pci,drive=disk1,bootindex=1 \ - -device e1000,netdev=net0 \ - -netdev user,id=net0,hostfwd=tcp::5555-:5555 \ - -device intel-iommu,device-iotlb=off \ - -nodefaults + $common_options +} + +function check_nested_vt(){ + nested=$(cat /sys/module/kvm_intel/parameters/nested) + if [[ $nested != 1 && $nested != 'Y' ]]; then + echo "E: Nested VT is not enabled!" + exit -1 + fi } version=`cat /proc/version` @@ -88,7 +77,8 @@ vno=$(echo $version | \ for(i=0;i "5.0.0" ]]; then +if [[ "$vno" > "5.0.0" ]]; then + check_nested_vt setup_vgpu if [[ $? == 0 ]]; then launch_hwrender From 7f753d12a2e384458b3926d811610083b63163fe Mon Sep 17 00:00:00 2001 From: buildslave Date: Fri, 13 Dec 2019 06:04:09 +0000 Subject: [PATCH 38/62] mixin updates Update script to avoid audio stuttering and correct audio pace Tracked-On: OAM-88716 Mixin-Reviewed-On: https://github.com/projectceladon/device-androidia-mixins/pull/466 Signed-off-by: padmashree9110 --- caas/setup_host.sh | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/caas/setup_host.sh b/caas/setup_host.sh index 70a50f79a..34f8cb358 100755 --- a/caas/setup_host.sh +++ b/caas/setup_host.sh @@ -20,6 +20,14 @@ function ubu_install_qemu(){ wget https://download.qemu.org/qemu-3.0.0.tar.xz tar -xf qemu-3.0.0.tar.xz cd qemu-3.0.0/ + wget https://patchwork.kernel.org/patch/10678791/raw/ -O Audio_fix.patch && patch -p1 < Audio_fix.patch + if [ $? != "0" ]; then + echo "Patch didn't apply" + echo "Please check ..." + exit 1 + else + echo "Patch applied" + fi ./configure --prefix=/usr \ --enable-kvm \ --disable-xen \ @@ -33,7 +41,7 @@ function ubu_install_qemu(){ --enable-opengl \ --enable-gtk \ --target-list=x86_64-softmmu \ - --audio-drv-list=alsa + --audio-drv-list=pa make -j24 make install cd ../ From 5b520cc1a37ae0777d69c4f1c4845db42d33032d Mon Sep 17 00:00:00 2001 From: buildslave Date: Fri, 13 Dec 2019 12:31:44 +0000 Subject: [PATCH 39/62] mixin updates kernel rebase to 4.19.87 for caas Tracked-On: OAM-88793 Mixin-Reviewed-On: https://github.com/projectceladon/device-androidia-mixins/pull/467 Signed-off-by: rnaidu --- .../bxt/android/non-embargoed/x86_64_defconfig | 12 +++++++----- .../bxt/android/non-embargoed/x86_64_defconfig | 12 +++++++----- .../bxt/android/non-embargoed/x86_64_defconfig | 12 +++++++----- 3 files changed, 21 insertions(+), 15 deletions(-) diff --git a/caas/config-lts/lts2018/bxt/android/non-embargoed/x86_64_defconfig b/caas/config-lts/lts2018/bxt/android/non-embargoed/x86_64_defconfig index 1ebafa925..b83d78ec9 100644 --- a/caas/config-lts/lts2018/bxt/android/non-embargoed/x86_64_defconfig +++ b/caas/config-lts/lts2018/bxt/android/non-embargoed/x86_64_defconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 4.19.78 Kernel Configuration +# Linux/x86_64 4.19.87 Kernel Configuration # # @@ -373,6 +373,9 @@ CONFIG_X86_SMAP=y CONFIG_X86_INTEL_UMIP=y # CONFIG_X86_INTEL_MPX is not set CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS=y +CONFIG_X86_INTEL_TSX_MODE_OFF=y +# CONFIG_X86_INTEL_TSX_MODE_ON is not set +# CONFIG_X86_INTEL_TSX_MODE_AUTO is not set CONFIG_EFI=y CONFIG_EFI_STUB=y # CONFIG_EFI_MIXED is not set @@ -3689,10 +3692,10 @@ CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y # # Frame buffer Devices # -CONFIG_FB=y -# CONFIG_FIRMWARE_EDID is not set CONFIG_FB_CMDLINE=y CONFIG_FB_NOTIFY=y +CONFIG_FB=y +# CONFIG_FIRMWARE_EDID is not set CONFIG_FB_BOOT_VESA_SUPPORT=y CONFIG_FB_CFB_FILLRECT=y CONFIG_FB_CFB_COPYAREA=y @@ -3945,8 +3948,8 @@ CONFIG_SND_USB_HIFACE=m # CONFIG_SND_USB_PODHD is not set # CONFIG_SND_USB_TONEPORT is not set # CONFIG_SND_USB_VARIAX is not set -CONFIG_BT_SCOHCI=m CONFIG_SND_SOC=y +CONFIG_BT_SCOHCI=m CONFIG_SND_SOC_COMPRESS=y CONFIG_SND_SOC_TOPOLOGY=y CONFIG_SND_SOC_ACPI=y @@ -4444,7 +4447,6 @@ CONFIG_USB_SERIAL_SSU100=y # CONFIG_USB_EMI26 is not set # CONFIG_USB_ADUTUX is not set # CONFIG_USB_SEVSEG is not set -# CONFIG_USB_RIO500 is not set # CONFIG_USB_LEGOTOWER is not set # CONFIG_USB_LCD is not set # CONFIG_USB_CYPRESS_CY7C63 is not set diff --git a/celadon_ivi/config-lts/lts2018/bxt/android/non-embargoed/x86_64_defconfig b/celadon_ivi/config-lts/lts2018/bxt/android/non-embargoed/x86_64_defconfig index 1ebafa925..b83d78ec9 100644 --- a/celadon_ivi/config-lts/lts2018/bxt/android/non-embargoed/x86_64_defconfig +++ b/celadon_ivi/config-lts/lts2018/bxt/android/non-embargoed/x86_64_defconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 4.19.78 Kernel Configuration +# Linux/x86_64 4.19.87 Kernel Configuration # # @@ -373,6 +373,9 @@ CONFIG_X86_SMAP=y CONFIG_X86_INTEL_UMIP=y # CONFIG_X86_INTEL_MPX is not set CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS=y +CONFIG_X86_INTEL_TSX_MODE_OFF=y +# CONFIG_X86_INTEL_TSX_MODE_ON is not set +# CONFIG_X86_INTEL_TSX_MODE_AUTO is not set CONFIG_EFI=y CONFIG_EFI_STUB=y # CONFIG_EFI_MIXED is not set @@ -3689,10 +3692,10 @@ CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y # # Frame buffer Devices # -CONFIG_FB=y -# CONFIG_FIRMWARE_EDID is not set CONFIG_FB_CMDLINE=y CONFIG_FB_NOTIFY=y +CONFIG_FB=y +# CONFIG_FIRMWARE_EDID is not set CONFIG_FB_BOOT_VESA_SUPPORT=y CONFIG_FB_CFB_FILLRECT=y CONFIG_FB_CFB_COPYAREA=y @@ -3945,8 +3948,8 @@ CONFIG_SND_USB_HIFACE=m # CONFIG_SND_USB_PODHD is not set # CONFIG_SND_USB_TONEPORT is not set # CONFIG_SND_USB_VARIAX is not set -CONFIG_BT_SCOHCI=m CONFIG_SND_SOC=y +CONFIG_BT_SCOHCI=m CONFIG_SND_SOC_COMPRESS=y CONFIG_SND_SOC_TOPOLOGY=y CONFIG_SND_SOC_ACPI=y @@ -4444,7 +4447,6 @@ CONFIG_USB_SERIAL_SSU100=y # CONFIG_USB_EMI26 is not set # CONFIG_USB_ADUTUX is not set # CONFIG_USB_SEVSEG is not set -# CONFIG_USB_RIO500 is not set # CONFIG_USB_LEGOTOWER is not set # CONFIG_USB_LCD is not set # CONFIG_USB_CYPRESS_CY7C63 is not set diff --git a/celadon_tablet/config-lts/lts2018/bxt/android/non-embargoed/x86_64_defconfig b/celadon_tablet/config-lts/lts2018/bxt/android/non-embargoed/x86_64_defconfig index 1ebafa925..b83d78ec9 100644 --- a/celadon_tablet/config-lts/lts2018/bxt/android/non-embargoed/x86_64_defconfig +++ b/celadon_tablet/config-lts/lts2018/bxt/android/non-embargoed/x86_64_defconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 4.19.78 Kernel Configuration +# Linux/x86_64 4.19.87 Kernel Configuration # # @@ -373,6 +373,9 @@ CONFIG_X86_SMAP=y CONFIG_X86_INTEL_UMIP=y # CONFIG_X86_INTEL_MPX is not set CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS=y +CONFIG_X86_INTEL_TSX_MODE_OFF=y +# CONFIG_X86_INTEL_TSX_MODE_ON is not set +# CONFIG_X86_INTEL_TSX_MODE_AUTO is not set CONFIG_EFI=y CONFIG_EFI_STUB=y # CONFIG_EFI_MIXED is not set @@ -3689,10 +3692,10 @@ CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y # # Frame buffer Devices # -CONFIG_FB=y -# CONFIG_FIRMWARE_EDID is not set CONFIG_FB_CMDLINE=y CONFIG_FB_NOTIFY=y +CONFIG_FB=y +# CONFIG_FIRMWARE_EDID is not set CONFIG_FB_BOOT_VESA_SUPPORT=y CONFIG_FB_CFB_FILLRECT=y CONFIG_FB_CFB_COPYAREA=y @@ -3945,8 +3948,8 @@ CONFIG_SND_USB_HIFACE=m # CONFIG_SND_USB_PODHD is not set # CONFIG_SND_USB_TONEPORT is not set # CONFIG_SND_USB_VARIAX is not set -CONFIG_BT_SCOHCI=m CONFIG_SND_SOC=y +CONFIG_BT_SCOHCI=m CONFIG_SND_SOC_COMPRESS=y CONFIG_SND_SOC_TOPOLOGY=y CONFIG_SND_SOC_ACPI=y @@ -4444,7 +4447,6 @@ CONFIG_USB_SERIAL_SSU100=y # CONFIG_USB_EMI26 is not set # CONFIG_USB_ADUTUX is not set # CONFIG_USB_SEVSEG is not set -# CONFIG_USB_RIO500 is not set # CONFIG_USB_LEGOTOWER is not set # CONFIG_USB_LCD is not set # CONFIG_USB_CYPRESS_CY7C63 is not set From 5a9d2ab61a88892317535779d165881e127a45a1 Mon Sep 17 00:00:00 2001 From: rbabub Date: Wed, 18 Dec 2019 15:02:42 +0530 Subject: [PATCH 40/62] [CIV] Enable 4k Touch device Adding the changes to support cvt 4k display Tracked-On: OAM-88790 Signed-off-by: rbabub --- caas/mixins.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/caas/mixins.spec b/caas/mixins.spec index e14195c2f..ae4fd5bb8 100755 --- a/caas/mixins.spec +++ b/caas/mixins.spec @@ -34,7 +34,7 @@ codec2: true usb: host usb-gadget: configfs(usb_config=adb,mtp_adb_pid=0x0a5f,ptp_adb_pid=0x0a61,rndis_pid=0x0a62,rndis_adb_pid=0x0a63,bcdDevice=0x0,bcdUSB=0x200,controller=dwc3.0.auto,f_acm=false,f_dvc_trace=true,dvctrace_source_dev=dvcith-0-msc0) midi: true -touch: galax7200 +touch: cvt0f21 navigationbar: true device-type: tablet debug-tools: true From 8506a4e276af038e8cfdd72024cb84da8c54f965 Mon Sep 17 00:00:00 2001 From: buildslave Date: Mon, 23 Dec 2019 07:26:01 +0000 Subject: [PATCH 41/62] mixin updates [CIV] Enable 4k Touch device Adding the changes to support cvt 4k display [CIV] Enable 4k Touch device Adding the changes to support cvt 4k display Tracked-On: OAM-88790 Mixin-Reviewed-On: https://github.com/projectceladon/device-androidia-mixins/pull/470 Mixin-Reviewed-On: https://github.com/projectceladon/device-androidia/pull/665 Signed-off-by: rbabub --- caas/device.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/caas/device.mk b/caas/device.mk index 4bc2eeee5..acc95a8c2 100644 --- a/caas/device.mk +++ b/caas/device.mk @@ -492,11 +492,12 @@ endif PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.software.midi.xml:vendor/etc/permissions/android.software.midi.xml ############################################################## -# Source: device/intel/mixins/groups/touch/galax7200/product.mk +# Source: device/intel/mixins/groups/touch/cvt0f21/product.mk ############################################################## PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.touchscreen.multitouch.jazzhand.xml:vendor/etc/permissions/android.hardware.touchscreen.multitouch.jazzhand.xml\ - $(INTEL_PATH_COMMON)/touch/Vendor_0eef_Product_7200.idc:system/usr/idc/Vendor_0eef_Product_7200.idc + $(INTEL_PATH_COMMON)/touch/Vendor_1ff7_Product_0f21.idc:system/usr/idc/Vendor_1ff7_Product_0f21.idc + ############################################################## # Source: device/intel/mixins/groups/debug-tools/true/product.mk ############################################################## From 045a34280f44229fb92c8eef61cfa0fa51e65b36 Mon Sep 17 00:00:00 2001 From: buildslave Date: Mon, 6 Jan 2020 12:27:36 +0000 Subject: [PATCH 42/62] mixin updates Enable "full-screen" in launching qemu For Android UI is booting with Full Screen, add an option in QEMU launching. For switching back to host from Androud Full screen, "Ctrl-Alt-F" can be used. Tracked-On: OAM-88724 Mixin-Reviewed-On: https://github.com/projectceladon/device-androidia-mixins/pull/471 Signed-off-by: Shaofeng Tang --- caas/start_android_qcow2.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/caas/start_android_qcow2.sh b/caas/start_android_qcow2.sh index 9a6873c7c..dd390fc44 100755 --- a/caas/start_android_qcow2.sh +++ b/caas/start_android_qcow2.sh @@ -47,6 +47,7 @@ common_options="\ -device e1000,netdev=net0 \ -netdev user,id=net0,hostfwd=tcp::5555-:5555 \ -device intel-iommu,device-iotlb=off \ + -full-screen \ -nodefaults " From ecfeeb863a57336b197738213e09b49c1baf40cd Mon Sep 17 00:00:00 2001 From: buildslave Date: Thu, 16 Jan 2020 09:34:23 +0000 Subject: [PATCH 43/62] mixin updates CIV: enable ramfb enable ramfb to support boot display. ramfb is a very simple framebuffer display device. It is intended to be configured by the firmware and used as boot framebuffer, until the guest OS loads a real GPU driver. Tracked-On: OAM-88855 Mixin-Reviewed-On: https://github.com/projectceladon/device-androidia-mixins/pull/469 Signed-off-by: JianFeng,Zhou --- caas/setup_host.sh | 28 ++++++++++++++++------------ caas/start_android_qcow2.sh | 6 +++--- 2 files changed, 19 insertions(+), 15 deletions(-) diff --git a/caas/setup_host.sh b/caas/setup_host.sh index 34f8cb358..69024af0a 100755 --- a/caas/setup_host.sh +++ b/caas/setup_host.sh @@ -1,6 +1,7 @@ #!/bin/bash reboot_required=0 +QEMU_REL=qemu-4.2.0 function ubu_changes_require(){ echo "Please make sure your apt is working" @@ -17,17 +18,9 @@ function ubu_install_qemu(){ apt autoremove -y apt install -y git libfdt-dev libpixman-1-dev libssl-dev vim socat libsdl1.2-dev libspice-server-dev autoconf libtool xtightvncviewer tightvncserver x11vnc libsdl1.2-dev uuid-runtime uuid uml-utilities bridge-utils python-dev liblzma-dev libc6-dev libegl1-mesa-dev libepoxy-dev libdrm-dev libgbm-dev libaio-dev libusb-1.0.0-dev libgtk-3-dev bison - wget https://download.qemu.org/qemu-3.0.0.tar.xz - tar -xf qemu-3.0.0.tar.xz - cd qemu-3.0.0/ - wget https://patchwork.kernel.org/patch/10678791/raw/ -O Audio_fix.patch && patch -p1 < Audio_fix.patch - if [ $? != "0" ]; then - echo "Patch didn't apply" - echo "Please check ..." - exit 1 - else - echo "Patch applied" - fi + wget https://download.qemu.org/$QEMU_REL.tar.xz + tar -xf $QEMU_REL.tar.xz + cd $QEMU_REL/ ./configure --prefix=/usr \ --enable-kvm \ --disable-xen \ @@ -41,12 +34,22 @@ function ubu_install_qemu(){ --enable-opengl \ --enable-gtk \ --target-list=x86_64-softmmu \ - --audio-drv-list=pa + --audio-drv-list=alsa make -j24 make install cd ../ } +function ubu_build_ovmf(){ + sudo apt install -y uuid-dev nasm acpidump iasl + cd $QEMU_REL/roms/edk2 + source ./edksetup.sh + make -C BaseTools/ + build -b DEBUG -t GCC5 -a X64 -p OvmfPkg/OvmfPkgX64.dsc -D NETWORK_IP4_ENABLE -D NETWORK_ENABLE -D SECURE_BOOT_ENABLE + cp Build/OvmfX64/DEBUG_GCC5/FV/OVMF.fd ../../../OVMF.fd + cd ../../../ +} + function ubu_enable_host_gvtg(){ if [[ ! `cat /etc/default/grub` =~ "i915.enable_gvt=1 intel_iommu=on" ]]; then read -p "The grub entry in '/etc/default/grub' will be updated for enabling GVT-g, do you want to continue? [Y/n]" res @@ -125,6 +128,7 @@ if [[ $version =~ "Ubuntu" ]]; then check_network ubu_changes_require ubu_install_qemu + ubu_build_ovmf ubu_enable_host_gvtg get_required_scripts check_kernel diff --git a/caas/start_android_qcow2.sh b/caas/start_android_qcow2.sh index dd390fc44..6680cc0eb 100755 --- a/caas/start_android_qcow2.sh +++ b/caas/start_android_qcow2.sh @@ -45,15 +45,15 @@ common_options="\ -drive file=$caas_image,if=none,id=disk1 \ -device virtio-blk-pci,drive=disk1,bootindex=1 \ -device e1000,netdev=net0 \ - -netdev user,id=net0,hostfwd=tcp::5555-:5555 \ - -device intel-iommu,device-iotlb=off \ + -netdev user,id=net0,hostfwd=tcp::5555-:5555,hostfwd=tcp::5554-:5554 \ + -device intel-iommu,device-iotlb=off,caching-mode=on \ -full-screen \ -nodefaults " function launch_hwrender(){ qemu-system-x86_64 \ - -device vfio-pci,sysfsdev=$GVTg_DEV_PATH/$GVTg_VGPU_UUID,display=on,x-igd-opregion=on \ + -device vfio-pci-nohotplug,ramfb=on,sysfsdev=$GVTg_DEV_PATH/$GVTg_VGPU_UUID,display=on,x-igd-opregion=on \ $common_options } From 2429a138c8d5e89a70afbe3f9f5f3eb22bdb3c87 Mon Sep 17 00:00:00 2001 From: buildslave Date: Sun, 19 Jan 2020 07:41:16 +0000 Subject: [PATCH 44/62] mixin updates CIV: fix QEMU 4.2 build error QEMU 4.2 depends on libsdl2-dev. install libsdl2-dev before building QEMU 4.2 Tracked-On: OAM-89033 Mixin-Reviewed-On: https://github.com/projectceladon/device-androidia-mixins/pull/480 Signed-off-by: JianFeng,Zhou --- caas/setup_host.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/caas/setup_host.sh b/caas/setup_host.sh index 69024af0a..c6a057e5e 100755 --- a/caas/setup_host.sh +++ b/caas/setup_host.sh @@ -16,7 +16,7 @@ function ubu_changes_require(){ function ubu_install_qemu(){ apt purge -y "qemu*" apt autoremove -y - apt install -y git libfdt-dev libpixman-1-dev libssl-dev vim socat libsdl1.2-dev libspice-server-dev autoconf libtool xtightvncviewer tightvncserver x11vnc libsdl1.2-dev uuid-runtime uuid uml-utilities bridge-utils python-dev liblzma-dev libc6-dev libegl1-mesa-dev libepoxy-dev libdrm-dev libgbm-dev libaio-dev libusb-1.0.0-dev libgtk-3-dev bison + apt install -y git libfdt-dev libpixman-1-dev libssl-dev vim socat libsdl2-dev libspice-server-dev autoconf libtool xtightvncviewer tightvncserver x11vnc uuid-runtime uuid uml-utilities bridge-utils python-dev liblzma-dev libc6-dev libegl1-mesa-dev libepoxy-dev libdrm-dev libgbm-dev libaio-dev libusb-1.0.0-dev libgtk-3-dev bison wget https://download.qemu.org/$QEMU_REL.tar.xz tar -xf $QEMU_REL.tar.xz From b5a68c2117fdcddd0c10dabd57514d1f4f9db530 Mon Sep 17 00:00:00 2001 From: buildslave Date: Mon, 20 Jan 2020 23:22:11 +0000 Subject: [PATCH 45/62] mixin updates Trusty: Use pre-built Trusty release binary to build tos image Tracked-On: OAM-88999 Mixin-Reviewed-On: https://github.com/projectceladon/device-androidia-mixins/pull/478 Signed-off-by: Zhong,Fangjian --- caas/AndroidBoard.mk | 9 ++------- caas/BoardConfig.mk | 12 ++---------- celadon_ivi/AndroidBoard.mk | 9 ++------- celadon_ivi/BoardConfig.mk | 12 ++---------- celadon_tablet/AndroidBoard.mk | 9 ++------- celadon_tablet/BoardConfig.mk | 12 ++---------- 6 files changed, 12 insertions(+), 51 deletions(-) diff --git a/caas/AndroidBoard.mk b/caas/AndroidBoard.mk index 40d1a1c67..e20412fa8 100644 --- a/caas/AndroidBoard.mk +++ b/caas/AndroidBoard.mk @@ -502,22 +502,17 @@ BOARD_MMC_SIZE = 15335424K ############################################################## .PHONY: tosimage multiboot -LK_ELF := $(TOP)/$(PRODUCT_OUT)/obj/trusty/build-sand-x86-64/lk.elf EVMM_PKG := $(TOP)/$(PRODUCT_OUT)/obj/trusty/evmm_pkg.bin EVMM_LK_PKG := $(TOP)/$(PRODUCT_OUT)/obj/trusty/evmm_lk_pkg.bin LOCAL_MAKE := make -$(LK_ELF): - @echo "making lk.elf.." - $(hide) (cd $(TOPDIR)trusty && $(TRUSTY_ENV_VAR) $(LOCAL_MAKE) sand-x86-64) - $(EVMM_PKG): @echo "making evmm.." $(hide) (cd $(TOPDIR)$(INTEL_PATH_VENDOR)/fw/evmm && $(TRUSTY_ENV_VAR) $(LOCAL_MAKE)) -$(EVMM_LK_PKG): $(LK_ELF) - @echo "making evmm(packing with lk.elf).." +$(EVMM_LK_PKG): + @echo "making evmm(packing with lk.bin).." $(hide) (cd $(TOPDIR)$(INTEL_PATH_VENDOR)/fw/evmm && $(TRUSTY_ENV_VAR) $(LOCAL_MAKE)) # include sub-makefile according to boot_arch diff --git a/caas/BoardConfig.mk b/caas/BoardConfig.mk index c7e20f5b6..3c732c488 100644 --- a/caas/BoardConfig.mk +++ b/caas/BoardConfig.mk @@ -273,28 +273,20 @@ BOARD_USES_KEYMASTER1 := true BOARD_SEPOLICY_DIRS += $(INTEL_PATH_SEPOLICY)/trusty BOARD_SEPOLICY_M4DEFS += module_trusty=true -LKBUILD_TOOLCHAIN_ROOT = $(PWD)/$(INTEL_PATH_VENDOR)/external/prebuilts/elf/ -LKBUILD_X86_TOOLCHAIN = $(LKBUILD_TOOLCHAIN_ROOT)i386-elf-4.9.1-Linux-x86_64/bin -LKBUILD_X64_TOOLCHAIN = $(LKBUILD_TOOLCHAIN_ROOT)x86_64-elf-4.9.1-Linux-x86_64/bin TRUSTY_BUILDROOT = $(PWD)/$(PRODUCT_OUT)/obj/trusty/ TRUSTY_ENV_VAR += TRUSTY_REF_TARGET=celadon_64 -#for trusty lk -TRUSTY_ENV_VAR += BUILDROOT=$(TRUSTY_BUILDROOT) -TRUSTY_ENV_VAR += PATH=$$PATH:$(LKBUILD_X86_TOOLCHAIN):$(LKBUILD_X64_TOOLCHAIN) -TRUSTY_ENV_VAR += CLANG_BINDIR=$(PWD)/$(LLVM_PREBUILTS_PATH) -TRUSTY_ENV_VAR += ARCH_x86_64_TOOLCHAIN_PREFIX=${PWD}/prebuilts/gcc/linux-x86/x86/x86_64-linux-android-${TARGET_GCC_VERSION}/bin/x86_64-linux-android- - #for trusty vmm # use same toolchain as android kernel +TRUSTY_ENV_VAR += CLANG_BINDIR=$(PWD)/$(LLVM_PREBUILTS_PATH) TRUSTY_ENV_VAR += COMPILE_TOOLCHAIN=$(YOCTO_CROSSCOMPILE) TRUSTY_ENV_VAR += TARGET_BUILD_VARIANT=$(TARGET_BUILD_VARIANT) TRUSTY_ENV_VAR += BOOT_ARCH=project-celadon # output build dir to android out folder TRUSTY_ENV_VAR += BUILD_DIR=$(TRUSTY_BUILDROOT) -TRUSTY_ENV_VAR += LKBIN_DIR=$(TRUSTY_BUILDROOT)/build-sand-x86-64/ +TRUSTY_ENV_VAR += LKBIN_DIR=$(PWD)/vendor/intel/fw/trusty-release-binaries/ #Fix the cpu hotplug fail due to the trusty. #Trusty will introduce some delay for cpu_up(). diff --git a/celadon_ivi/AndroidBoard.mk b/celadon_ivi/AndroidBoard.mk index 0eb01a505..fc706bb0c 100644 --- a/celadon_ivi/AndroidBoard.mk +++ b/celadon_ivi/AndroidBoard.mk @@ -506,22 +506,17 @@ BOARD_MMC_SIZE = 15335424K ############################################################## .PHONY: tosimage multiboot -LK_ELF := $(TOP)/$(PRODUCT_OUT)/obj/trusty/build-sand-x86-64/lk.elf EVMM_PKG := $(TOP)/$(PRODUCT_OUT)/obj/trusty/evmm_pkg.bin EVMM_LK_PKG := $(TOP)/$(PRODUCT_OUT)/obj/trusty/evmm_lk_pkg.bin LOCAL_MAKE := make -$(LK_ELF): - @echo "making lk.elf.." - $(hide) (cd $(TOPDIR)trusty && $(TRUSTY_ENV_VAR) $(LOCAL_MAKE) sand-x86-64) - $(EVMM_PKG): @echo "making evmm.." $(hide) (cd $(TOPDIR)$(INTEL_PATH_VENDOR)/fw/evmm && $(TRUSTY_ENV_VAR) $(LOCAL_MAKE)) -$(EVMM_LK_PKG): $(LK_ELF) - @echo "making evmm(packing with lk.elf).." +$(EVMM_LK_PKG): + @echo "making evmm(packing with lk.bin).." $(hide) (cd $(TOPDIR)$(INTEL_PATH_VENDOR)/fw/evmm && $(TRUSTY_ENV_VAR) $(LOCAL_MAKE)) # include sub-makefile according to boot_arch diff --git a/celadon_ivi/BoardConfig.mk b/celadon_ivi/BoardConfig.mk index a3579c696..6d86c62e3 100644 --- a/celadon_ivi/BoardConfig.mk +++ b/celadon_ivi/BoardConfig.mk @@ -333,28 +333,20 @@ BOARD_USES_KEYMASTER1 := true BOARD_SEPOLICY_DIRS += $(INTEL_PATH_SEPOLICY)/trusty BOARD_SEPOLICY_M4DEFS += module_trusty=true -LKBUILD_TOOLCHAIN_ROOT = $(PWD)/$(INTEL_PATH_VENDOR)/external/prebuilts/elf/ -LKBUILD_X86_TOOLCHAIN = $(LKBUILD_TOOLCHAIN_ROOT)i386-elf-4.9.1-Linux-x86_64/bin -LKBUILD_X64_TOOLCHAIN = $(LKBUILD_TOOLCHAIN_ROOT)x86_64-elf-4.9.1-Linux-x86_64/bin TRUSTY_BUILDROOT = $(PWD)/$(PRODUCT_OUT)/obj/trusty/ TRUSTY_ENV_VAR += TRUSTY_REF_TARGET=celadon_64 -#for trusty lk -TRUSTY_ENV_VAR += BUILDROOT=$(TRUSTY_BUILDROOT) -TRUSTY_ENV_VAR += PATH=$$PATH:$(LKBUILD_X86_TOOLCHAIN):$(LKBUILD_X64_TOOLCHAIN) -TRUSTY_ENV_VAR += CLANG_BINDIR=$(PWD)/$(LLVM_PREBUILTS_PATH) -TRUSTY_ENV_VAR += ARCH_x86_64_TOOLCHAIN_PREFIX=${PWD}/prebuilts/gcc/linux-x86/x86/x86_64-linux-android-${TARGET_GCC_VERSION}/bin/x86_64-linux-android- - #for trusty vmm # use same toolchain as android kernel +TRUSTY_ENV_VAR += CLANG_BINDIR=$(PWD)/$(LLVM_PREBUILTS_PATH) TRUSTY_ENV_VAR += COMPILE_TOOLCHAIN=$(YOCTO_CROSSCOMPILE) TRUSTY_ENV_VAR += TARGET_BUILD_VARIANT=$(TARGET_BUILD_VARIANT) TRUSTY_ENV_VAR += BOOT_ARCH=project-celadon # output build dir to android out folder TRUSTY_ENV_VAR += BUILD_DIR=$(TRUSTY_BUILDROOT) -TRUSTY_ENV_VAR += LKBIN_DIR=$(TRUSTY_BUILDROOT)/build-sand-x86-64/ +TRUSTY_ENV_VAR += LKBIN_DIR=$(PWD)/vendor/intel/fw/trusty-release-binaries/ #Fix the cpu hotplug fail due to the trusty. #Trusty will introduce some delay for cpu_up(). diff --git a/celadon_tablet/AndroidBoard.mk b/celadon_tablet/AndroidBoard.mk index 8e233c0c3..ee91a5964 100644 --- a/celadon_tablet/AndroidBoard.mk +++ b/celadon_tablet/AndroidBoard.mk @@ -517,22 +517,17 @@ BOARD_MMC_SIZE = 15335424K ############################################################## .PHONY: tosimage multiboot -LK_ELF := $(TOP)/$(PRODUCT_OUT)/obj/trusty/build-sand-x86-64/lk.elf EVMM_PKG := $(TOP)/$(PRODUCT_OUT)/obj/trusty/evmm_pkg.bin EVMM_LK_PKG := $(TOP)/$(PRODUCT_OUT)/obj/trusty/evmm_lk_pkg.bin LOCAL_MAKE := make -$(LK_ELF): - @echo "making lk.elf.." - $(hide) (cd $(TOPDIR)trusty && $(TRUSTY_ENV_VAR) $(LOCAL_MAKE) sand-x86-64) - $(EVMM_PKG): @echo "making evmm.." $(hide) (cd $(TOPDIR)$(INTEL_PATH_VENDOR)/fw/evmm && $(TRUSTY_ENV_VAR) $(LOCAL_MAKE)) -$(EVMM_LK_PKG): $(LK_ELF) - @echo "making evmm(packing with lk.elf).." +$(EVMM_LK_PKG): + @echo "making evmm(packing with lk.bin).." $(hide) (cd $(TOPDIR)$(INTEL_PATH_VENDOR)/fw/evmm && $(TRUSTY_ENV_VAR) $(LOCAL_MAKE)) # include sub-makefile according to boot_arch diff --git a/celadon_tablet/BoardConfig.mk b/celadon_tablet/BoardConfig.mk index 17d00da20..9793e1722 100644 --- a/celadon_tablet/BoardConfig.mk +++ b/celadon_tablet/BoardConfig.mk @@ -329,28 +329,20 @@ BOARD_USES_KEYMASTER1 := true BOARD_SEPOLICY_DIRS += $(INTEL_PATH_SEPOLICY)/trusty BOARD_SEPOLICY_M4DEFS += module_trusty=true -LKBUILD_TOOLCHAIN_ROOT = $(PWD)/$(INTEL_PATH_VENDOR)/external/prebuilts/elf/ -LKBUILD_X86_TOOLCHAIN = $(LKBUILD_TOOLCHAIN_ROOT)i386-elf-4.9.1-Linux-x86_64/bin -LKBUILD_X64_TOOLCHAIN = $(LKBUILD_TOOLCHAIN_ROOT)x86_64-elf-4.9.1-Linux-x86_64/bin TRUSTY_BUILDROOT = $(PWD)/$(PRODUCT_OUT)/obj/trusty/ TRUSTY_ENV_VAR += TRUSTY_REF_TARGET=celadon_64 -#for trusty lk -TRUSTY_ENV_VAR += BUILDROOT=$(TRUSTY_BUILDROOT) -TRUSTY_ENV_VAR += PATH=$$PATH:$(LKBUILD_X86_TOOLCHAIN):$(LKBUILD_X64_TOOLCHAIN) -TRUSTY_ENV_VAR += CLANG_BINDIR=$(PWD)/$(LLVM_PREBUILTS_PATH) -TRUSTY_ENV_VAR += ARCH_x86_64_TOOLCHAIN_PREFIX=${PWD}/prebuilts/gcc/linux-x86/x86/x86_64-linux-android-${TARGET_GCC_VERSION}/bin/x86_64-linux-android- - #for trusty vmm # use same toolchain as android kernel +TRUSTY_ENV_VAR += CLANG_BINDIR=$(PWD)/$(LLVM_PREBUILTS_PATH) TRUSTY_ENV_VAR += COMPILE_TOOLCHAIN=$(YOCTO_CROSSCOMPILE) TRUSTY_ENV_VAR += TARGET_BUILD_VARIANT=$(TARGET_BUILD_VARIANT) TRUSTY_ENV_VAR += BOOT_ARCH=project-celadon # output build dir to android out folder TRUSTY_ENV_VAR += BUILD_DIR=$(TRUSTY_BUILDROOT) -TRUSTY_ENV_VAR += LKBIN_DIR=$(TRUSTY_BUILDROOT)/build-sand-x86-64/ +TRUSTY_ENV_VAR += LKBIN_DIR=$(PWD)/vendor/intel/fw/trusty-release-binaries/ #Fix the cpu hotplug fail due to the trusty. #Trusty will introduce some delay for cpu_up(). From 6ac96d5bc5106fe15ed6b6817572ba901e4e9347 Mon Sep 17 00:00:00 2001 From: buildslave Date: Wed, 22 Jan 2020 02:54:20 +0000 Subject: [PATCH 46/62] mixin updates Use PulseAudio as Audio backend with config change QEMU has default timer-period set to 10 milliseconds. This is quite long for PulseAudio, which causes audio distortion. It is solved by reducing timer-period to 5 milliseconds. Tested Audio playback/capture. Tracked-On: OAM-89014 Mixin-Reviewed-On: https://github.com/projectceladon/device-androidia-mixins/pull/485 Signed-off-by: Prashanth M, Shakthi --- caas/start_android_qcow2.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/caas/start_android_qcow2.sh b/caas/start_android_qcow2.sh index 6680cc0eb..945301343 100755 --- a/caas/start_android_qcow2.sh +++ b/caas/start_android_qcow2.sh @@ -42,6 +42,7 @@ common_options="\ -chardev socket,id=charserial0,path=./kernel-console,server,nowait \ -device isa-serial,chardev=charserial0,id=serial0 \ -device intel-hda -device hda-duplex \ + -audiodev id=android_spk,timer-period=5000,driver=pa \ -drive file=$caas_image,if=none,id=disk1 \ -device virtio-blk-pci,drive=disk1,bootindex=1 \ -device e1000,netdev=net0 \ From 4187edc3a06f2a52a8fff44099451c60959ba350 Mon Sep 17 00:00:00 2001 From: buildslave Date: Wed, 22 Jan 2020 13:13:46 +0000 Subject: [PATCH 47/62] mixin updates Add PulseAudio as backend at build time QEMU audio backend needs to be configured at build time. This commit adds PulseAudio as backedn at build time. Tracked-On: OAM-89307 Mixin-Reviewed-On: https://github.com/projectceladon/device-androidia-mixins/pull/486 Signed-off-by: Prashanth M, Shakthi --- caas/setup_host.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/caas/setup_host.sh b/caas/setup_host.sh index c6a057e5e..bb6ccfb99 100755 --- a/caas/setup_host.sh +++ b/caas/setup_host.sh @@ -34,7 +34,7 @@ function ubu_install_qemu(){ --enable-opengl \ --enable-gtk \ --target-list=x86_64-softmmu \ - --audio-drv-list=alsa + --audio-drv-list=pa make -j24 make install cd ../ From c35fd76820f926a04e2c751ff67b158361eaf0b9 Mon Sep 17 00:00:00 2001 From: buildslave Date: Thu, 30 Jan 2020 12:53:52 +0000 Subject: [PATCH 48/62] mixin updates Rebasing the kernel to 4.19.94 on caas Tracked-On: OAM-89587 Mixin-Reviewed-On: https://github.com/projectceladon/device-androidia-mixins/pull/487 Signed-off-by: rnaidu --- .../lts2018/bxt/android/non-embargoed/x86_64_defconfig | 4 ++-- .../lts2018/bxt/android/non-embargoed/x86_64_defconfig | 4 ++-- .../lts2018/bxt/android/non-embargoed/x86_64_defconfig | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/caas/config-lts/lts2018/bxt/android/non-embargoed/x86_64_defconfig b/caas/config-lts/lts2018/bxt/android/non-embargoed/x86_64_defconfig index b83d78ec9..c62a95cf6 100644 --- a/caas/config-lts/lts2018/bxt/android/non-embargoed/x86_64_defconfig +++ b/caas/config-lts/lts2018/bxt/android/non-embargoed/x86_64_defconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 4.19.87 Kernel Configuration +# Linux/x86_64 4.19.94 Kernel Configuration # # @@ -3948,8 +3948,8 @@ CONFIG_SND_USB_HIFACE=m # CONFIG_SND_USB_PODHD is not set # CONFIG_SND_USB_TONEPORT is not set # CONFIG_SND_USB_VARIAX is not set -CONFIG_SND_SOC=y CONFIG_BT_SCOHCI=m +CONFIG_SND_SOC=y CONFIG_SND_SOC_COMPRESS=y CONFIG_SND_SOC_TOPOLOGY=y CONFIG_SND_SOC_ACPI=y diff --git a/celadon_ivi/config-lts/lts2018/bxt/android/non-embargoed/x86_64_defconfig b/celadon_ivi/config-lts/lts2018/bxt/android/non-embargoed/x86_64_defconfig index b83d78ec9..c62a95cf6 100644 --- a/celadon_ivi/config-lts/lts2018/bxt/android/non-embargoed/x86_64_defconfig +++ b/celadon_ivi/config-lts/lts2018/bxt/android/non-embargoed/x86_64_defconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 4.19.87 Kernel Configuration +# Linux/x86_64 4.19.94 Kernel Configuration # # @@ -3948,8 +3948,8 @@ CONFIG_SND_USB_HIFACE=m # CONFIG_SND_USB_PODHD is not set # CONFIG_SND_USB_TONEPORT is not set # CONFIG_SND_USB_VARIAX is not set -CONFIG_SND_SOC=y CONFIG_BT_SCOHCI=m +CONFIG_SND_SOC=y CONFIG_SND_SOC_COMPRESS=y CONFIG_SND_SOC_TOPOLOGY=y CONFIG_SND_SOC_ACPI=y diff --git a/celadon_tablet/config-lts/lts2018/bxt/android/non-embargoed/x86_64_defconfig b/celadon_tablet/config-lts/lts2018/bxt/android/non-embargoed/x86_64_defconfig index b83d78ec9..c62a95cf6 100644 --- a/celadon_tablet/config-lts/lts2018/bxt/android/non-embargoed/x86_64_defconfig +++ b/celadon_tablet/config-lts/lts2018/bxt/android/non-embargoed/x86_64_defconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 4.19.87 Kernel Configuration +# Linux/x86_64 4.19.94 Kernel Configuration # # @@ -3948,8 +3948,8 @@ CONFIG_SND_USB_HIFACE=m # CONFIG_SND_USB_PODHD is not set # CONFIG_SND_USB_TONEPORT is not set # CONFIG_SND_USB_VARIAX is not set -CONFIG_SND_SOC=y CONFIG_BT_SCOHCI=m +CONFIG_SND_SOC=y CONFIG_SND_SOC_COMPRESS=y CONFIG_SND_SOC_TOPOLOGY=y CONFIG_SND_SOC_ACPI=y From dc926af95a09bc118439962946bab3cdfa805e9a Mon Sep 17 00:00:00 2001 From: "Lu,Yang A" Date: Wed, 22 Jan 2020 03:41:28 +0800 Subject: [PATCH 49/62] change Vsync offset of app and SurfaceFlinger to improve performance on 4K Tracked-On: OAM-88781 --- caas/BoardConfig.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/caas/BoardConfig.mk b/caas/BoardConfig.mk index 3c732c488..e87f2c77b 100644 --- a/caas/BoardConfig.mk +++ b/caas/BoardConfig.mk @@ -380,8 +380,8 @@ BOARD_GPU_DRIVERS := i965 virgl BOARD_USE_CUSTOMIZED_MESA := true # System's VSYNC phase offsets in nanoseconds -VSYNC_EVENT_PHASE_OFFSET_NS := 7500000 -SF_VSYNC_EVENT_PHASE_OFFSET_NS := 3000000 +VSYNC_EVENT_PHASE_OFFSET_NS := 1000000 +SF_VSYNC_EVENT_PHASE_OFFSET_NS := 12000000 BOARD_GPU_DRIVERS ?= i965 swrast virgl ifneq ($(strip $(BOARD_GPU_DRIVERS)),) From 7df3eb854934d05e563130e791156b00e71b9f1f Mon Sep 17 00:00:00 2001 From: buildslave Date: Tue, 18 Feb 2020 03:21:32 +0000 Subject: [PATCH 50/62] mixin updates [CELADON] Issue resolved when the image file is large Tracked-On: OAM-89658 Mixin-Reviewed-On: https://github.com/projectceladon/device-androidia-mixins/pull/497 Signed-off-by: swaroopb --- caas/BoardConfig.mk | 4 ++-- caas/start_flash_usb.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/caas/BoardConfig.mk b/caas/BoardConfig.mk index e87f2c77b..3c732c488 100644 --- a/caas/BoardConfig.mk +++ b/caas/BoardConfig.mk @@ -380,8 +380,8 @@ BOARD_GPU_DRIVERS := i965 virgl BOARD_USE_CUSTOMIZED_MESA := true # System's VSYNC phase offsets in nanoseconds -VSYNC_EVENT_PHASE_OFFSET_NS := 1000000 -SF_VSYNC_EVENT_PHASE_OFFSET_NS := 12000000 +VSYNC_EVENT_PHASE_OFFSET_NS := 7500000 +SF_VSYNC_EVENT_PHASE_OFFSET_NS := 3000000 BOARD_GPU_DRIVERS ?= i965 swrast virgl ifneq ($(strip $(BOARD_GPU_DRIVERS)),) diff --git a/caas/start_flash_usb.sh b/caas/start_flash_usb.sh index c396ef3fa..f02593f8c 100755 --- a/caas/start_flash_usb.sh +++ b/caas/start_flash_usb.sh @@ -8,7 +8,7 @@ qemu-img create -f qcow2 android.qcow2 16G [ -d "./flashfiles_decompress" ] && rm -rf "./flashfiles_decompress" mkdir ./flashfiles_decompress unzip $@ -d ./flashfiles_decompress -dd if=/dev/zero of=./flash.vfat bs=63M count=80 +dd if=/dev/zero of=./flash.vfat bs=63M count=160 mkfs.vfat ./flash.vfat mcopy -i flash.vfat flashfiles_decompress/* :: From 3e4af3402de0fced7d6828e89f8cba73331ae3f8 Mon Sep 17 00:00:00 2001 From: buildslave Date: Wed, 19 Feb 2020 22:08:24 +0000 Subject: [PATCH 51/62] mixin updates Update scripts for automation Launch kvmgt module before start QEMU on host linux kernel higher than 5.3.0, kvmgt not launched by default. need to launch kvmgt module before start QEMU. otherwise, VGPU can't be created and android UI will not be shown. Tracked-On: OAM-89684 Tracked-On:OAM-89705 Mixin-Reviewed-On: https://github.com/projectceladon/device-androidia-mixins/pull/499 Mixin-Reviewed-On: https://github.com/projectceladon/device-androidia-mixins/pull/500 Signed-off-by: JianFeng,Zhou Signed-off-by: padmashree9110 --- caas/setup_host.sh | 12 ++++++++ caas/start_android_qcow2.sh | 55 +++++++++++++++++++++++++++++++------ caas/start_flash_usb.sh | 26 ++++++++++++++++-- 3 files changed, 81 insertions(+), 12 deletions(-) diff --git a/caas/setup_host.sh b/caas/setup_host.sh index bb6ccfb99..4a697c435 100755 --- a/caas/setup_host.sh +++ b/caas/setup_host.sh @@ -2,6 +2,7 @@ reboot_required=0 QEMU_REL=qemu-4.2.0 +a=`grep -rn CIV_WORK_DIR /etc/environment` function ubu_changes_require(){ echo "Please make sure your apt is working" @@ -122,6 +123,15 @@ function get_required_scripts(){ chmod +x start_android_qcow2.sh } +function save_env(){ + if [ -z "$a" ]; then + echo "export CIV_WORK_DIR=$(pwd)" | tee -a /etc/environment + else + sed -i "s|export CIV_WORK_DIR.*||g" /etc/environment + echo "export CIV_WORK_DIR=$(pwd)" | tee -a /etc/environment + fi +} + version=`cat /proc/version` if [[ $version =~ "Ubuntu" ]]; then @@ -132,6 +142,7 @@ if [[ $version =~ "Ubuntu" ]]; then ubu_enable_host_gvtg get_required_scripts check_kernel + save_env ask_reboot elif [[ $version =~ "Clear Linux OS" ]]; then check_network @@ -139,6 +150,7 @@ elif [[ $version =~ "Clear Linux OS" ]]; then clr_enable_host_gvtg get_required_scripts check_kernel + save_env ask_reboot else echo "only clearlinux or Ubuntu is supported" diff --git a/caas/start_android_qcow2.sh b/caas/start_android_qcow2.sh index 945301343..5e63aaff3 100755 --- a/caas/start_android_qcow2.sh +++ b/caas/start_android_qcow2.sh @@ -18,12 +18,23 @@ function setup_vgpu(){ return $res } +if [[ $1 == "--display-off" ]] +then + display_type="none" + ramfb_state="off" + display_state="off" +else + display_type="gtk,gl=on" + ramfb_state="on" + display_state="on" +fi + common_options="\ -m 2048 -smp 2 -M q35 \ -name caas-vm \ -enable-kvm \ -vga none \ - -display gtk,gl=on \ + -display $display_type \ -k en-us \ -machine kernel_irqchip=off \ -global PIIX4_PM.disable_s3=1 -global PIIX4_PM.disable_s4=1 \ @@ -49,19 +60,42 @@ common_options="\ -netdev user,id=net0,hostfwd=tcp::5555-:5555,hostfwd=tcp::5554-:5554 \ -device intel-iommu,device-iotlb=off,caching-mode=on \ -full-screen \ + -pidfile android_vm.pid \ -nodefaults " function launch_hwrender(){ - qemu-system-x86_64 \ - -device vfio-pci-nohotplug,ramfb=on,sysfsdev=$GVTg_DEV_PATH/$GVTg_VGPU_UUID,display=on,x-igd-opregion=on \ - $common_options + if [[ $1 == "--display-off" ]] + then + qemu-system-x86_64 \ + -device vfio-pci-nohotplug,ramfb=$ramfb_state,sysfsdev=$GVTg_DEV_PATH/$GVTg_VGPU_UUID,display=$display_state,x-igd-opregion=on \ + $common_options & + sleep 5 + echo -n "Android started successfully and is running in background, pid of the process is:" + cat android_vm.pid + echo -ne '\n' + else + qemu-system-x86_64 \ + -device vfio-pci-nohotplug,ramfb=$ramfb_state,sysfsdev=$GVTg_DEV_PATH/$GVTg_VGPU_UUID,display=$display_state,x-igd-opregion=on \ + $common_options + fi } function launch_swrender(){ - qemu-system-x86_64 \ - -device qxl-vga,xres=1280,yres=720 \ - $common_options + if [[ $1 == "--display-off" ]] + then + qemu-system-x86_64 \ + -device qxl-vga,xres=1280,yres=720 \ + $common_options & + sleep 5 + echo -n "Android started successfully and is running in background, pid of the process is:" + cat android_vm.pid + echo -ne '\n' + else + qemu-system-x86_64 \ + -device qxl-vga,xres=1280,yres=720 \ + $common_options + fi } function check_nested_vt(){ @@ -80,13 +114,16 @@ vno=$(echo $version | \ }' ) if [[ "$vno" > "5.0.0" ]]; then + if [[ "$vno" > "5.3.0" ]]; then + modprobe kvmgt + fi check_nested_vt setup_vgpu if [[ $? == 0 ]]; then - launch_hwrender + launch_hwrender $1 else echo "W: Failed to create vgpu, fall to software rendering" - launch_swrender + launch_swrender $1 fi else echo "E: Detected linux version $vno" diff --git a/caas/start_flash_usb.sh b/caas/start_flash_usb.sh index f02593f8c..a58c0f006 100755 --- a/caas/start_flash_usb.sh +++ b/caas/start_flash_usb.sh @@ -1,13 +1,24 @@ #!/bin/bash -[ $# -ne 1 ] && echo "Usage: $0 caas-flashfiles-eng-.zip" && exit -1 -[ -f "./android.qcow2" ] && echo "android.qcow2 already exsited, please backup/remove it before generating" && exit -1 +[ $# -lt 1 ] && echo "Usage: $0 caas-flashfiles-eng-.zip" && exit -1 + +if [ -f android.qcow2 ] +then + echo -n "android.qcow2 already exsited, Do you want to flash new one(y/N):" + read option + if [ "$option" == 'y' ] + then + rm android.qcow2 + else + exit 1 + fi +fi qemu-img create -f qcow2 android.qcow2 16G [ -d "./flashfiles_decompress" ] && rm -rf "./flashfiles_decompress" mkdir ./flashfiles_decompress -unzip $@ -d ./flashfiles_decompress +unzip $1 -d ./flashfiles_decompress dd if=/dev/zero of=./flash.vfat bs=63M count=160 mkfs.vfat ./flash.vfat mcopy -i flash.vfat flashfiles_decompress/* :: @@ -15,6 +26,13 @@ mcopy -i flash.vfat flashfiles_decompress/* :: ovmf_file="./OVMF.fd" [ ! -f $ovmf_file ] && ovmf_file="/usr/share/qemu/OVMF.fd" +if [[ $2 == "--display-off" ]] +then + display_type="none" +else + display_type="gtk,gl=on" +fi + qemu-system-x86_64 \ -m 2048 -smp 2 -M q35 \ -name caas-vm \ @@ -32,5 +50,7 @@ qemu-system-x86_64 \ -device scsi-hd,drive=scsidisk1,bus=scsi0.0 \ -drive file=$ovmf_file,format=raw,if=pflash \ -no-reboot \ + -display $display_type \ -boot menu=on,splash-time=5000,strict=on \ +echo "Flashing is completed" From 9c6c83fa4d6a5eb27a51fbb5c302503dbb1e2582 Mon Sep 17 00:00:00 2001 From: Xihua Chen Date: Thu, 20 Feb 2020 15:09:14 +0800 Subject: [PATCH 52/62] set permissive Tracked-On: Signed-off-by: Xihua Chen --- caas/mixins.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/caas/mixins.spec b/caas/mixins.spec index ae4fd5bb8..b29c298ce 100755 --- a/caas/mixins.spec +++ b/caas/mixins.spec @@ -10,7 +10,7 @@ product.mk: device.mk kernel: gmin64(useprebuilt=false,src_path=kernel/lts2018, loglevel=7, interactive_governor=false, relative_sleepstates=false, modules_in_bootimg=false, external_modules=,debug_modules=, use_bcmdhd=false, use_iwlwifi=false, extmod_platform=bxt, iwl_defconfig=, cfg_path=config-lts/lts2018/bxt/android/non-embargoed, more_modules=true) disk-bus: auto boot-arch: project-celadon(uefi_arch=x86_64,fastboot=efi,ignore_rsci=true,disable_watchdog=true,watchdog_parameters=10 30,verity_warning=false,txe_bind_root_of_trust=false,bootloader_block_size=4096,verity_mode=false,disk_encryption=false,file_encryption=true,target=caas,rpmb_simulate=true,ignore_not_applicable_reset=true,self_usb_device_mode_protocol=true,usb_storage=true,live_boot=true) -sepolicy: enforcing +sepolicy: permissive bluetooth: auto(ivi=false) audio: project-celadon vendor-partition: true(partition_size=600,partition_name=vendor) From 66a06d824eb0366ab025bc8c01b15e85ec52db17 Mon Sep 17 00:00:00 2001 From: xihua Date: Tue, 25 Feb 2020 14:09:43 +0800 Subject: [PATCH 53/62] Create dhcp_eth0.sh --- caas/dhcp_eth0.sh | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 caas/dhcp_eth0.sh diff --git a/caas/dhcp_eth0.sh b/caas/dhcp_eth0.sh new file mode 100644 index 000000000..6819139b0 --- /dev/null +++ b/caas/dhcp_eth0.sh @@ -0,0 +1,5 @@ +#!/system/bin/sh + +/system/bin/ifconfig eth0 up +/system/bin/ifconfig eth0 $(/system/bin/dhcp | /system/bin/grep dhcpip | /system/bin/cut -d ":" -f2) +/system/bin/ifconfig eth0 From 678273fe3fddec517deeb88811031cdb8a22c6fe Mon Sep 17 00:00:00 2001 From: xihua Date: Tue, 25 Feb 2020 14:54:18 +0800 Subject: [PATCH 54/62] Update device.mk --- caas/device.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/caas/device.mk b/caas/device.mk index acc95a8c2..b2fc981bb 100644 --- a/caas/device.mk +++ b/caas/device.mk @@ -1,3 +1,5 @@ +PRODUCT_COPY_FILES += \ + $(LOCAL_PATH)/dhcp_eth0.sh:$(TARGET_COPY_OUT_VENDOR)/bin/dhcp_eth0.sh \ # ----------------- BEGIN MIX-IN DEFINITIONS ----------------- # Mix-In definitions are auto-generated by mixin-update ############################################################## From df53f96a5d31b61d5d37f3938638a625d0e48b20 Mon Sep 17 00:00:00 2001 From: xihua Date: Tue, 25 Feb 2020 14:54:36 +0800 Subject: [PATCH 55/62] Update device.mk --- caas/device.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/caas/device.mk b/caas/device.mk index b2fc981bb..734e27072 100644 --- a/caas/device.mk +++ b/caas/device.mk @@ -1,5 +1,5 @@ PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/dhcp_eth0.sh:$(TARGET_COPY_OUT_VENDOR)/bin/dhcp_eth0.sh \ + $(LOCAL_PATH)/dhcp_eth0.sh:$(TARGET_COPY_OUT_VENDOR)/bin/dhcp_eth0.sh # ----------------- BEGIN MIX-IN DEFINITIONS ----------------- # Mix-In definitions are auto-generated by mixin-update ############################################################## From aa613bb92e4d62d8b90f2148f4a4a5925b664bda Mon Sep 17 00:00:00 2001 From: xihua Date: Tue, 25 Feb 2020 15:14:05 +0800 Subject: [PATCH 56/62] Update device.mk --- caas/device.mk | 2 -- 1 file changed, 2 deletions(-) diff --git a/caas/device.mk b/caas/device.mk index 734e27072..acc95a8c2 100644 --- a/caas/device.mk +++ b/caas/device.mk @@ -1,5 +1,3 @@ -PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/dhcp_eth0.sh:$(TARGET_COPY_OUT_VENDOR)/bin/dhcp_eth0.sh # ----------------- BEGIN MIX-IN DEFINITIONS ----------------- # Mix-In definitions are auto-generated by mixin-update ############################################################## From ef119c11ce8d6ea1360855dbf6dcc01d44961997 Mon Sep 17 00:00:00 2001 From: xihua Date: Tue, 25 Feb 2020 15:20:32 +0800 Subject: [PATCH 57/62] Delete dhcp_eth0.sh --- caas/dhcp_eth0.sh | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 caas/dhcp_eth0.sh diff --git a/caas/dhcp_eth0.sh b/caas/dhcp_eth0.sh deleted file mode 100644 index 6819139b0..000000000 --- a/caas/dhcp_eth0.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/system/bin/sh - -/system/bin/ifconfig eth0 up -/system/bin/ifconfig eth0 $(/system/bin/dhcp | /system/bin/grep dhcpip | /system/bin/cut -d ":" -f2) -/system/bin/ifconfig eth0 From 966a9d7175d9c335f942d60c3cea69e89f3d72da Mon Sep 17 00:00:00 2001 From: xihua Date: Wed, 4 Mar 2020 08:09:07 +0800 Subject: [PATCH 58/62] Update mixins.spec --- caas/mixins.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/caas/mixins.spec b/caas/mixins.spec index b29c298ce..dc7d60f80 100755 --- a/caas/mixins.spec +++ b/caas/mixins.spec @@ -10,7 +10,7 @@ product.mk: device.mk kernel: gmin64(useprebuilt=false,src_path=kernel/lts2018, loglevel=7, interactive_governor=false, relative_sleepstates=false, modules_in_bootimg=false, external_modules=,debug_modules=, use_bcmdhd=false, use_iwlwifi=false, extmod_platform=bxt, iwl_defconfig=, cfg_path=config-lts/lts2018/bxt/android/non-embargoed, more_modules=true) disk-bus: auto boot-arch: project-celadon(uefi_arch=x86_64,fastboot=efi,ignore_rsci=true,disable_watchdog=true,watchdog_parameters=10 30,verity_warning=false,txe_bind_root_of_trust=false,bootloader_block_size=4096,verity_mode=false,disk_encryption=false,file_encryption=true,target=caas,rpmb_simulate=true,ignore_not_applicable_reset=true,self_usb_device_mode_protocol=true,usb_storage=true,live_boot=true) -sepolicy: permissive +sepolicy: enforcing bluetooth: auto(ivi=false) audio: project-celadon vendor-partition: true(partition_size=600,partition_name=vendor) @@ -32,7 +32,7 @@ wlan: auto codecs: configurable(hw_ve_h265=true, hw_vd_vp9=true, hw_vd_mp2=true, hw_vd_vc1=false, platform=bxt, profile_file=media_profiles_1080p.xml) codec2: true usb: host -usb-gadget: configfs(usb_config=adb,mtp_adb_pid=0x0a5f,ptp_adb_pid=0x0a61,rndis_pid=0x0a62,rndis_adb_pid=0x0a63,bcdDevice=0x0,bcdUSB=0x200,controller=dwc3.0.auto,f_acm=false,f_dvc_trace=true,dvctrace_source_dev=dvcith-0-msc0) +usb-gadget: configfs(usb_config=adb,mtp_adb_pid=0x0a5f,ptp_adb_pid=0x0a61,rndis_pid=0x0a62,rndis_adb_pid=0x0a63,bcdDevice=0x0,bcdUSB=0x200,controller=dwc3.1.auto,f_acm=false,f_dvc_trace=true,dvctrace_source_dev=dvcith-0-msc0) midi: true touch: cvt0f21 navigationbar: true From 709c73a78745006bf3e2bd086f30cb8dd3922c59 Mon Sep 17 00:00:00 2001 From: xihua Date: Wed, 4 Mar 2020 14:17:15 +0800 Subject: [PATCH 59/62] add odm --- caas/mixins.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/caas/mixins.spec b/caas/mixins.spec index dc7d60f80..92e613e62 100755 --- a/caas/mixins.spec +++ b/caas/mixins.spec @@ -82,3 +82,4 @@ atrace: true firmware: true(all_firmwares=true) aaf: true suspend: never +odm-partition: true From 0d524999ba10aa8fa8efa2ff7d9b53c6de0a3cbe Mon Sep 17 00:00:00 2001 From: xihua Date: Wed, 4 Mar 2020 16:28:48 +0800 Subject: [PATCH 60/62] Update mixins.spec --- caas/mixins.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/caas/mixins.spec b/caas/mixins.spec index 92e613e62..e5caf8e98 100755 --- a/caas/mixins.spec +++ b/caas/mixins.spec @@ -15,6 +15,7 @@ bluetooth: auto(ivi=false) audio: project-celadon vendor-partition: true(partition_size=600,partition_name=vendor) acpio-partition: true(partition_size=2) +odm-partition: true config-partition: true display-density: medium dalvik-heap: tablet-10in-xhdpi-2048 @@ -82,4 +83,3 @@ atrace: true firmware: true(all_firmwares=true) aaf: true suspend: never -odm-partition: true From c77598d7430d0726476d5eb235081f9deffe73fb Mon Sep 17 00:00:00 2001 From: xihua Date: Thu, 5 Mar 2020 09:18:13 +0800 Subject: [PATCH 61/62] Update mixins.spec --- caas/mixins.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/caas/mixins.spec b/caas/mixins.spec index e5caf8e98..c7944bfa5 100755 --- a/caas/mixins.spec +++ b/caas/mixins.spec @@ -15,8 +15,8 @@ bluetooth: auto(ivi=false) audio: project-celadon vendor-partition: true(partition_size=600,partition_name=vendor) acpio-partition: true(partition_size=2) -odm-partition: true config-partition: true +odm-partition: true display-density: medium dalvik-heap: tablet-10in-xhdpi-2048 cpu-arch: x86 From 4cf03dcc241ef9da9218f119916de51325807170 Mon Sep 17 00:00:00 2001 From: xihua Date: Mon, 30 Mar 2020 10:11:48 +0800 Subject: [PATCH 62/62] Update mixins.spec --- caas/mixins.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/caas/mixins.spec b/caas/mixins.spec index c7944bfa5..bbef0bb91 100755 --- a/caas/mixins.spec +++ b/caas/mixins.spec @@ -33,7 +33,7 @@ wlan: auto codecs: configurable(hw_ve_h265=true, hw_vd_vp9=true, hw_vd_mp2=true, hw_vd_vc1=false, platform=bxt, profile_file=media_profiles_1080p.xml) codec2: true usb: host -usb-gadget: configfs(usb_config=adb,mtp_adb_pid=0x0a5f,ptp_adb_pid=0x0a61,rndis_pid=0x0a62,rndis_adb_pid=0x0a63,bcdDevice=0x0,bcdUSB=0x200,controller=dwc3.1.auto,f_acm=false,f_dvc_trace=true,dvctrace_source_dev=dvcith-0-msc0) +usb-gadget: configfs(usb_config=adb,mtp_adb_pid=0x0a5f,ptp_adb_pid=0x0a61,rndis_pid=0x0a62,rndis_adb_pid=0x0a63,bcdDevice=0x0,bcdUSB=0x200,controller=dwc3.0.auto,f_acm=false,f_dvc_trace=true,dvctrace_source_dev=dvcith-0-msc0) midi: true touch: cvt0f21 navigationbar: true