Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Aaos slimandroid in AAOS #1815

Draft
wants to merge 8 commits into
base: celadon/s/mr0/master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@



# Allow celadon_ivi directory
!celadon_ivi/
# Allow base_aaos directory
!base_aaos/
39 changes: 19 additions & 20 deletions celadon_ivi/AndroidBoard.mk → base_aaos/AndroidBoard.mk
Original file line number Diff line number Diff line change
Expand Up @@ -76,14 +76,14 @@ KF4UEFI := $(PRODUCT_OUT)/efi/kernelflinger.efi
BOARD_FIRST_STAGE_LOADER := $(KF4UEFI)
BOARD_EXTRA_EFI_MODULES :=

#$(call flashfile_add_blob,capsule.fv,$(INTEL_PATH_HARDWARE)/fw_capsules/celadon_ivi/::variant::/$(BIOS_VARIANT)/capsule.fv,,BOARD_SFU_UPDATE)
#$(call flashfile_add_blob,ifwi.bin,$(INTEL_PATH_HARDWARE)/fw_capsules/celadon_ivi/::variant::/$(BIOS_VARIANT)/ifwi.bin,,EFI_IFWI_BIN)
#$(call flashfile_add_blob,ifwi_dnx.bin,$(INTEL_PATH_HARDWARE)/fw_capsules/celadon_ivi/::variant::/$(BIOS_VARIANT)/ifwi_dnx.bin,,EFI_IFWI_DNX_BIN)
#$(call flashfile_add_blob,firmware.bin,$(INTEL_PATH_HARDWARE)/fw_capsules/celadon_ivi/::variant::/$(BIOS_VARIANT)/emmc.bin,,EFI_EMMC_BIN)
#$(call flashfile_add_blob,afu.bin,$(INTEL_PATH_HARDWARE)/fw_capsules/celadon_ivi/::variant::/$(BIOS_VARIANT)/afu.bin,,EFI_AFU_BIN)
#$(call flashfile_add_blob,dnxp_0x1.bin,$(INTEL_PATH_HARDWARE)/fw_capsules/celadon_ivi/::variant::/$(BIOS_VARIANT)/dnxp_0x1.bin,,DNXP_BIN)
#$(call flashfile_add_blob,cfgpart.xml,$(INTEL_PATH_HARDWARE)/fw_capsules/celadon_ivi/::variant::/$(BIOS_VARIANT)/cfgpart.xml,,CFGPART_XML)
#$(call flashfile_add_blob,cse_spi.bin,$(INTEL_PATH_HARDWARE)/fw_capsules/celadon_ivi/::variant::/$(BIOS_VARIANT)/cse_spi.bin,,CSE_SPI_BIN)
#$(call flashfile_add_blob,capsule.fv,$(INTEL_PATH_HARDWARE)/fw_capsules/base_aaos/::variant::/$(BIOS_VARIANT)/capsule.fv,,BOARD_SFU_UPDATE)
#$(call flashfile_add_blob,ifwi.bin,$(INTEL_PATH_HARDWARE)/fw_capsules/base_aaos/::variant::/$(BIOS_VARIANT)/ifwi.bin,,EFI_IFWI_BIN)
#$(call flashfile_add_blob,ifwi_dnx.bin,$(INTEL_PATH_HARDWARE)/fw_capsules/base_aaos/::variant::/$(BIOS_VARIANT)/ifwi_dnx.bin,,EFI_IFWI_DNX_BIN)
#$(call flashfile_add_blob,firmware.bin,$(INTEL_PATH_HARDWARE)/fw_capsules/base_aaos/::variant::/$(BIOS_VARIANT)/emmc.bin,,EFI_EMMC_BIN)
#$(call flashfile_add_blob,afu.bin,$(INTEL_PATH_HARDWARE)/fw_capsules/base_aaos/::variant::/$(BIOS_VARIANT)/afu.bin,,EFI_AFU_BIN)
#$(call flashfile_add_blob,dnxp_0x1.bin,$(INTEL_PATH_HARDWARE)/fw_capsules/base_aaos/::variant::/$(BIOS_VARIANT)/dnxp_0x1.bin,,DNXP_BIN)
#$(call flashfile_add_blob,cfgpart.xml,$(INTEL_PATH_HARDWARE)/fw_capsules/base_aaos/::variant::/$(BIOS_VARIANT)/cfgpart.xml,,CFGPART_XML)
#$(call flashfile_add_blob,cse_spi.bin,$(INTEL_PATH_HARDWARE)/fw_capsules/base_aaos/::variant::/$(BIOS_VARIANT)/cse_spi.bin,,CSE_SPI_BIN)


ifneq ($(EFI_IFWI_BIN),)
Expand Down Expand Up @@ -136,8 +136,13 @@ BOARD_BOOTLOADER_IASIMAGE := $(BOARD_BOOTLOADER_DIR)/kf4sbl.sbl
BOARD_BOOTLOADER_VAR_IMG := $(BOARD_BOOTLOADER_DIR)/bootloader.img
BOARD_FLASHFILES += $(BOARD_BOOTLOADER_DEFAULT_IMG):bootloader

ifeq ($(TARGET_PRODUCT),blizzard_ivi)
PREBUILT_INSTALLER := hardware/intel/kernelflinger/prebuilt/board/RPL_IVI/$(TARGET_PRODUCT)/installer.efi
PREBUILT_KERNELFLINGER := hardware/intel/kernelflinger/prebuilt/board/RPL_IVI/$(TARGET_PRODUCT)/kernelflinger.efi
else
PREBUILT_INSTALLER := hardware/intel/kernelflinger/prebuilt/board/RPL_IVI/installer.efi
PREBUILT_KERNELFLINGER := hardware/intel/kernelflinger/prebuilt/board/RPL_IVI/kernelflinger.efi
endif
INSTALLER_EFI := $(PRODUCT_OUT)/efi/installer.efi

$(BOARD_BOOTLOADER_DIR):
Expand Down Expand Up @@ -299,16 +304,7 @@ KERNEL_CCSLOP := $(filter-out time_macros,$(subst $(comma), ,$(CCACHE_SLOPPINESS
KERNEL_CCSLOP := $(subst $(space),$(comma),$(KERNEL_CCSLOP))


ifeq ($(BASE_CHROMIUM_KERNEL), true)
LOCAL_KERNEL_SRC := kernel/lts2019-chromium
KERNEL_CONFIG_PATH := $(TARGET_DEVICE_DIR)/config-lts/lts2019-chromium
else ifeq ($(BASE_LTS2020_YOCTO_KERNEL), true)
LOCAL_KERNEL_SRC := kernel/lts2020-yocto
KERNEL_CONFIG_PATH := $(TARGET_DEVICE_DIR)/config-lts/lts2020-yocto
else ifeq ($(BASE_LTS2020_CHROMIUM_KERNEL), true)
LOCAL_KERNEL_SRC := kernel/lts2020-chromium
KERNEL_CONFIG_PATH := $(TARGET_DEVICE_DIR)/config-lts/lts2020-chromium
else ifeq ($(BASE_LINUX_INTEL_LTS2021_KERNEL), true)
ifeq ($(BASE_LINUX_INTEL_LTS2021_KERNEL), true)
LOCAL_KERNEL_SRC := kernel/linux-intel-lts2021
KERNEL_CONFIG_PATH := $(TARGET_DEVICE_DIR)/config-lts/linux-intel-lts2021
else
Expand Down Expand Up @@ -536,7 +532,7 @@ AUTO_IN += $(TARGET_DEVICE_DIR)/extra_files/audio/auto_hal.in
KERNEL_CAR_DIFFCONFIG = $(wildcard $(KERNEL_CONFIG_PATH)/car_diffconfig)
KERNEL_DIFFCONFIG += $(KERNEL_CAR_DIFFCONFIG)
##############################################################
# Source: device/intel/mixins/groups/device-specific/celadon_ivi/AndroidBoard.mk
# Source: device/intel/mixins/groups/device-specific/base_aaos/AndroidBoard.mk
##############################################################
KERNEL_APL_DIFFCONFIG = $(wildcard $(KERNEL_CONFIG_PATH)/apl_nuc_diffconfig)
KERNEL_DIFFCONFIG += $(KERNEL_APL_DIFFCONFIG)
Expand Down Expand Up @@ -864,7 +860,7 @@ $(LOCAL_BUILT_MODULE): $(LOCAL_SRC)
##############################################################
# Source: device/intel/mixins/groups/gptbuild/true/AndroidBoard.mk
##############################################################
gptimage_size ?= 32G
gptimage_size ?= 160G

raw_config := none
raw_factory := none
Expand Down Expand Up @@ -983,6 +979,9 @@ $(PRODUCT_OUT)/system.img: $(DOCKERD_ENV_RESOLV_CONF)
LIC_IMAGE_SOURCE := $(PRODUCT_OUT)/vendor/etc/docker/gamecore.tar
$(LIC_IMAGE_SOURCE):
@mkdir -p $(PRODUCT_OUT)/vendor/etc/docker
ifneq ($(wildcard $(TOP)/vendor/intel/weston-in-docker/image),)
@cp -r $(TOP)/vendor/intel/weston-in-docker/image $(PRODUCT_OUT)/vendor/etc/docker/
endif
ifneq ($(wildcard $(TOP)/vendor/intel/weston-in-docker/gamecore),)
@tar --exclude .git -cf $(PRODUCT_OUT)/vendor/etc/docker/gamecore.tar -C $(TOP)/vendor/intel/weston-in-docker/gamecore .
endif
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#

PRODUCT_MAKEFILES += \
$(LOCAL_DIR)/celadon_ivi.mk \
$(LOCAL_DIR)/base_aaos.mk \

COMMON_LUNCH_CHOICES += \
celadon_ivi-userdebug \
base_aaos-userdebug \
42 changes: 29 additions & 13 deletions celadon_ivi/BoardConfig.mk → base_aaos/BoardConfig.mk
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ BOARD_TOSIMAGE_PARTITION_SIZE := 10485760
BOARD_BOOTLOADER_PARTITION_SIZE ?= $$((33 * 1024 * 1024))
BOARD_BOOTLOADER_BLOCK_SIZE := 4096
BOARD_SYSTEMIMAGE_FILE_SYSTEM_TYPE := ext4
DATA_USE_F2FS := False
DATA_USE_F2FS := true

#fastbootd over ethernet support
TARGET_RECOVERY_UI_LIB:=librecovery_ui_ethernet
Expand Down Expand Up @@ -192,12 +192,8 @@ TARGET_USES_64_BIT_BINDER := true
# Source: device/intel/mixins/groups/kernel/gmin64/BoardConfig.mk
##############################################################
# Specify location of board-specific kernel headers
ifeq ($(BASE_CHROMIUM_KERNEL), true)
TARGET_BOARD_KERNEL_HEADERS := $(INTEL_PATH_COMMON)/kernel/lts2019-chromium/kernel-headers
else ifeq ($(BASE_LTS2020_YOCTO_KERNEL), true)
TARGET_BOARD_KERNEL_HEADERS := $(INTEL_PATH_COMMON)/kernel/lts2020-yocto/kernel-headers
else ifeq ($(BASE_LTS2020_CHROMIUM_KERNEL), true)
TARGET_BOARD_KERNEL_HEADERS := $(INTEL_PATH_COMMON)/kernel/lts2020-chromium/kernel-headers
ifeq ($(BASE_LINUX_INTEL_LTS2021_KERNEL), true)
TARGET_BOARD_KERNEL_HEADERS := $(INTEL_PATH_COMMON)/kernel/linux-intel-lts2021/kernel-headers
else
TARGET_BOARD_KERNEL_HEADERS := $(INTEL_PATH_COMMON)/kernel/linux-intel-lts2021/kernel-headers
endif
Expand Down Expand Up @@ -307,7 +303,7 @@ BOARD_SEPOLICY_DIRS += \
TARGET_USES_CAR_FUTURE_FEATURES := true
BOARD_SEPOLICY_M4DEFS += module_carservice_app=true
##############################################################
# Source: device/intel/mixins/groups/device-specific/celadon_ivi/BoardConfig.mk
# Source: device/intel/mixins/groups/device-specific/base_aaos/BoardConfig.mk
##############################################################
DEVICE_PACKAGE_OVERLAYS += ${TARGET_DEVICE_DIR}/overlay

Expand Down Expand Up @@ -338,6 +334,19 @@ BOARD_FLASHFILES += $(PRODUCT_OUT)/scripts/start_flash_usb.sh
BOARD_FLASHFILES += $(PRODUCT_OUT)/scripts/auto_switch_pt_usb_vms.sh
BOARD_FLASHFILES += $(PRODUCT_OUT)/scripts/findall.py
BOARD_FLASHFILES += $(PRODUCT_OUT)/scripts/setup_host.sh
#BOARD_FLASHFILES += $(PRODUCT_OUT)/product/app/avmapk/avmapp.apk
BOARD_FLASHFILES += $(PRODUCT_OUT)/system/lib64/libcarcam_feature_avm.so
BOARD_FLASHFILES += $(PRODUCT_OUT)/system/lib64/libSurroundViewSim.so
BOARD_FLASHFILES += $(PRODUCT_OUT)/system/lib64/libvc_avm.so
BOARD_FLASHFILES += $(PRODUCT_OUT)/system/lib64/libvideocat.so
BOARD_FLASHFILES += $(PRODUCT_OUT)/system/lib64/libvideocatsupport.so
BOARD_FLASHFILES += $(PRODUCT_OUT)/system/bin/carcam
BOARD_FLASHFILES += $(PRODUCT_OUT)/system/etc/automotive/videocat_support/videocat_config.json
BOARD_FLASHFILES += $(PRODUCT_OUT)/system/etc/SViewCam4Lens_default.txt
BOARD_FLASHFILES += $(PRODUCT_OUT)/system/etc/SViewTune.camera
BOARD_FLASHFILES += $(PRODUCT_OUT)/system/etc/SViewTune_calib.camera
BOARD_FLASHFILES += $(PRODUCT_OUT)/system/etc/underCar_padded.ppm
BOARD_FLASHFILES += $(PRODUCT_OUT)/system/etc/underCar_TC.ppm
BOARD_FLASHFILES += $(PRODUCT_OUT)/scripts/sof_audio/configure_sof.sh
BOARD_FLASHFILES += $(PRODUCT_OUT)/scripts/setup_audio_host.sh
BOARD_FLASHFILES += $(PRODUCT_OUT)/scripts/guest_pm_control
Expand Down Expand Up @@ -468,6 +477,14 @@ ALLOW_MISSING_DEPENDENCIES := true
# enable dex-preoptimization.
WITH_DEXPREOPT := true
##############################################################
# Source: device/intel/mixins/groups/pstore/ram/BoardConfig.mk.1
##############################################################
BOARD_SEPOLICY_DIRS += $(INTEL_PATH_SEPOLICY)/pstore
##############################################################
# Source: device/intel/mixins/groups/pstore/ram/BoardConfig.mk
##############################################################
BOARD_KERNEL_CMDLINE += pstore.backend=ramoops
##############################################################
# Source: device/intel/mixins/groups/media/auto/BoardConfig.mk
##############################################################
SYSTEM_EXT_PRIVATE_SEPOLICY_DIRS += $(INTEL_PATH_SEPOLICY)/system_ext/private
Expand All @@ -481,7 +498,7 @@ LIBDRM_VER ?= intel

BOARD_KERNEL_CMDLINE += i915.modeset=1 drm.atomic=1 i915.nuclear_pageflip=1 drm.vblankoffdelay=1 i915.fastboot=1

BOARD_KERNEL_CMDLINE += i915.enable_guc=1
BOARD_KERNEL_CMDLINE += i915.enable_guc=7 udmabuf.list_limit=8192

USE_OPENGL_RENDERER := true
USE_INTEL_UFO_DRIVER := false
Expand Down Expand Up @@ -523,13 +540,12 @@ BOARD_SEPOLICY_M4DEFS += module_hwc_info_service=true
##############################################################
BOARD_SEPOLICY_DIRS += $(INTEL_PATH_SEPOLICY)/ethernet/common
##############################################################
# Source: device/intel/mixins/groups/camera-ext/ext-camera-only/BoardConfig.mk
# Source: device/intel/mixins/groups/camera-ext/ivi/BoardConfig.mk
##############################################################
# Enable only USB camera and disable all CSI Cameras
BOARD_CAMERA_USB_STANDALONE = true

# SELinux support for USB camera
BOARD_SEPOLICY_DIRS += $(INTEL_PATH_SEPOLICY)/camera-ext/ext-camera-only
BOARD_SEPOLICY_DIRS += $(INTEL_PATH_SEPOLICY)/camera-ext/ivi
##############################################################
# Source: device/intel/mixins/groups/rfkill/true/BoardConfig.mk
##############################################################
Expand Down Expand Up @@ -609,7 +625,7 @@ BOARD_SEPOLICY_DIRS += $(INTEL_PATH_SEPOLICY)/memtrack
##############################################################
# Source: device/intel/mixins/groups/tpm/true/BoardConfig.mk
##############################################################
TARGET_USE_TPM := true
TARGET_USE_TPM := false
##############################################################
# Source: device/intel/mixins/groups/avx/auto/BoardConfig.mk
##############################################################
Expand Down
File renamed without changes.
File renamed without changes.
75 changes: 75 additions & 0 deletions base_aaos/audio/default/mixer_paths_0.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
<mixer>
<!-- These are the initial mixer settings -->
<ctl name="Master Playback Volume" value="87 87" />
<ctl name="Master Playback Switch" value="1 1" />
<ctl name="Headphone Playback Switch" value="0 0" />
<ctl name="Speaker Playback Switch" value="0 0" />
<ctl name="Capture Switch" value="0 0" />
<!-- settings for new cards-->
<ctl name="DAI select" value="0" />
<ctl name="DAC MIXL INF1 Switch" value="1" />
<ctl name="DAC MIXR INF1 Switch" value="1" />
<ctl name="Stereo DAC MIXL DAC L1 Switch" value="1" />
<ctl name="Stereo DAC MIXR DAC R1 Switch" value="1" />
<ctl name="OUT MIXL DAC L1 Switch" value="1" />
<ctl name="OUT MIXR DAC R1 Switch" value="1" />
<ctl name="HPO MIX HPVOL Switch" value="1" />
<ctl name="HP Channel Switch" value="1" />
<ctl name="HP L Playback Switch" value="1" />
<ctl name="HP R Playback Switch" value="1" />
<!-- settings for new card mic -->
<ctl name="RECMIXL BST1 Switch" value="0" />
<ctl name="RECMIXR BST1 Switch" value="0" />
<ctl name="RECMIXL BST1 Switch" value="1" />
<ctl name="RECMIXR BST1 Switch" value="1" />
<ctl name="Stereo ADC1 Mux" value="ADC" />
<ctl name="Stereo ADC MIXL ADC2 Switch" value="0" />
<ctl name="Stereo ADC MIXR ADC2 Switch" value="0" />
<ctl name="Stereo ADC MIXL ADC1 Switch" value="1" />
<ctl name="Stereo ADC MIXR ADC1 Switch" value="1" />
<ctl name="IN2 Boost" value="4" />
<!--additional set as per poland team configuration-->
<ctl name="Mono Playback Switch" value="1" />
<ctl name="Speaker Playback Volume" value="17 17" />
<ctl name="HP Playback Volume" value="31 31" />
<ctl name="OUT Playback Volume" value="31 31" />
<ctl name="DAC2 Playback Switch" value="1 1" />
<ctl name="DAC2 Playback Volume" value="175 175" />
<ctl name="DAC1 Playback Volume" value="175 175" />
<ctl name="IN Capture Volume" value="23 23" />
<ctl name="ADC Capture Switch" value="1 1" />
<ctl name="ADC Capture Volume" value="72 72" />
<ctl name="Mono ADC Capture Volume " value="47 47" />
<ctl name="Stereo ADC1 Mux " value="1" />
<ctl name="Mono ADC L1 Mux" value="1" />
<ctl name="Mono ADC R1 Mux" value="1" />
<ctl name="ADC IF1 Data Switch" value="0" />
<ctl name="DAC IF1 Data Switch" value="0" />
<ctl name="ADC IF2 Data Switch" value="0" />
<ctl name="DAC IF2 Data Switch" value="0" />
<ctl name="RECMIXR BST2 Switch" value="1" />
<ctl name="RECMIXL BST2 Switch" value="1" />


<path name="speaker">
<ctl name="Master Playback Switch" value="1 1" />
<ctl name="Speaker Playback Switch" value="1 1" />
</path>

<path name="headphone">
<ctl name="Master Playback Switch" value="1 1" />
<ctl name="Headphone Playback Switch" value="1 1" />
</path>

<path name="main-mic">
<ctl name="Capture Switch" value="1 1" />
<ctl name="Capture Volume" value="63 63" />
<ctl name="Capture Source" value="Internal Mic" />
</path>

<path name="headset-mic">
<ctl name="Capture Switch" value="1 1" />
<ctl name="Capture Volume" value="63 63" />
<ctl name="Capture Source" value="Headset Mic" />
</path>
</mixer>
Loading
Loading