Snap for 11853201 from 443b449e02
to 24Q3-release
Change-Id: I6c354b7525a1fadae65a7fff3ee0a19cb4b441a5
This commit is contained in:
commit
ffbb5db763
5 changed files with 36 additions and 0 deletions
30
BoardConfig-shusky-common.mk
Normal file
30
BoardConfig-shusky-common.mk
Normal file
|
@ -0,0 +1,30 @@
|
||||||
|
#
|
||||||
|
# Copyright (C) 2024 The Android Open-Source Project
|
||||||
|
#
|
||||||
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
# you may not use this file except in compliance with the License.
|
||||||
|
# You may obtain a copy of the License at
|
||||||
|
#
|
||||||
|
# http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
#
|
||||||
|
# Unless required by applicable law or agreed to in writing, software
|
||||||
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
# See the License for the specific language governing permissions and
|
||||||
|
# limitations under the License.
|
||||||
|
#
|
||||||
|
|
||||||
|
ifeq ($(PRODUCT_16K_DEVELOPER_OPTION),true)
|
||||||
|
# Configures the 16kb kernel and modules for OTA updates.
|
||||||
|
TARGET_KERNEL_DIR_16K := $(RELEASE_KERNEL_HUSKY_DIR)/16kb
|
||||||
|
BOARD_KERNEL_PATH_16K := $(TARGET_KERNEL_DIR_16K)/Image.lz4
|
||||||
|
|
||||||
|
BOARD_KERNEL_MODULES_16K += $(file < $(TARGET_KERNEL_DIR_16K)/vendor_kernel_boot.modules.load)
|
||||||
|
BOARD_KERNEL_MODULES_16K += $(file < $(TARGET_KERNEL_DIR_16K)/system_dlkm.modules.load)
|
||||||
|
BOARD_KERNEL_MODULES_16K += $(file < $(TARGET_KERNEL_DIR_16K)/vendor_dlkm.modules.load)
|
||||||
|
BOARD_KERNEL_MODULES_16K := $(foreach module,$(BOARD_KERNEL_MODULES_16K),$(TARGET_KERNEL_DIR_16K)/$(notdir $(module)))
|
||||||
|
|
||||||
|
# Shusky targets use exynos-bcm_dbg.ko module instead of bcm_dbg.ko.
|
||||||
|
BOARD_KERNEL_MODULES_16K := $(filter-out %/bcm_dbg.ko,$(BOARD_KERNEL_MODULES_16K))
|
||||||
|
BOARD_KERNEL_MODULES_LOAD_16K := $(foreach module,$(BOARD_KERNEL_MODULES_16K),$(notdir $(module)))
|
||||||
|
endif
|
|
@ -37,6 +37,8 @@ ifeq ($(DEVICE_PAGE_AGNOSTIC),true)
|
||||||
TARGET_USERDATAIMAGE_FILE_SYSTEM_TYPE := ext4
|
TARGET_USERDATAIMAGE_FILE_SYSTEM_TYPE := ext4
|
||||||
TARGET_KERNEL_DIR := $(RELEASE_KERNEL_HUSKY_DIR)/16kb
|
TARGET_KERNEL_DIR := $(RELEASE_KERNEL_HUSKY_DIR)/16kb
|
||||||
TARGET_RW_FILE_SYSTEM_TYPE := ext4
|
TARGET_RW_FILE_SYSTEM_TYPE := ext4
|
||||||
|
else
|
||||||
|
PRODUCT_16K_DEVELOPER_OPTION := $(RELEASE_GOOGLE_SHIBA_16K_DEVELOPER_OPTION)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
$(call inherit-product-if-exists, vendor/google_devices/shusky/prebuilts/device-vendor-husky.mk)
|
$(call inherit-product-if-exists, vendor/google_devices/shusky/prebuilts/device-vendor-husky.mk)
|
||||||
|
|
|
@ -30,6 +30,8 @@ ifeq ($(DEVICE_PAGE_AGNOSTIC),true)
|
||||||
TARGET_USERDATAIMAGE_FILE_SYSTEM_TYPE := ext4
|
TARGET_USERDATAIMAGE_FILE_SYSTEM_TYPE := ext4
|
||||||
TARGET_KERNEL_DIR := $(RELEASE_KERNEL_SHIBA_DIR)/16kb
|
TARGET_KERNEL_DIR := $(RELEASE_KERNEL_SHIBA_DIR)/16kb
|
||||||
TARGET_RW_FILE_SYSTEM_TYPE := ext4
|
TARGET_RW_FILE_SYSTEM_TYPE := ext4
|
||||||
|
else
|
||||||
|
PRODUCT_16K_DEVELOPER_OPTION := $(RELEASE_GOOGLE_SHIBA_16K_DEVELOPER_OPTION)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
$(call inherit-product-if-exists, vendor/google_devices/shusky/prebuilts/device-vendor-shiba.mk)
|
$(call inherit-product-if-exists, vendor/google_devices/shusky/prebuilts/device-vendor-shiba.mk)
|
||||||
|
|
|
@ -47,6 +47,7 @@ BOARD_KERNEL_CMDLINE += disable_dma32=on
|
||||||
WIFI_FEATURE_REAR_CAMERA_SAR := true
|
WIFI_FEATURE_REAR_CAMERA_SAR := true
|
||||||
$(call soong_config_set,wifi,feature_rear_camera_sar,$(WIFI_FEATURE_REAR_CAMERA_SAR))
|
$(call soong_config_set,wifi,feature_rear_camera_sar,$(WIFI_FEATURE_REAR_CAMERA_SAR))
|
||||||
|
|
||||||
|
include device/google/shusky/BoardConfig-shusky-common.mk
|
||||||
include device/google/shusky/device-shusky-common.mk
|
include device/google/shusky/device-shusky-common.mk
|
||||||
|
|
||||||
include device/google/zuma/BoardConfig-common.mk
|
include device/google/zuma/BoardConfig-common.mk
|
||||||
|
|
|
@ -43,6 +43,7 @@ USES_DEVICE_GOOGLE_SHUSKY := true
|
||||||
BOARD_KERNEL_CMDLINE += swiotlb=noforce
|
BOARD_KERNEL_CMDLINE += swiotlb=noforce
|
||||||
BOARD_KERNEL_CMDLINE += disable_dma32=on
|
BOARD_KERNEL_CMDLINE += disable_dma32=on
|
||||||
|
|
||||||
|
include device/google/shusky/BoardConfig-shusky-common.mk
|
||||||
include device/google/shusky/device-shusky-common.mk
|
include device/google/shusky/device-shusky-common.mk
|
||||||
|
|
||||||
include device/google/zuma/BoardConfig-common.mk
|
include device/google/zuma/BoardConfig-common.mk
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue