set permissive

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
 ##############################################################
@@ -464,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
@@ -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
 ##############################################################
@@ -506,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

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
@@ -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
 ##############################################################
@@ -240,24 +188,19 @@ 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)
 
 # 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
 ##############################################################
@@ -330,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().
@@ -391,29 +326,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
@@ -441,21 +376,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
@@ -573,6 +509,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

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

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.94 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
@@ -624,7 +627,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
 
@@ -2129,7 +2132,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
@@ -2276,7 +2279,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
 
@@ -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
@@ -4151,7 +4154,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 +4229,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
@@ -4443,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