Evolution-X-Tensor/device_google_shusky
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

16k: Move BoardConfig-shusky-common.mk to device/google/zuma/BoardConfig-16k-common.mk

Browse source 
The makefile logic in this file is identical to the logic required for
akita-trunk_staging-userdebug. Hence, this logic is moved to
device/google/zuma/BoardConfig-16k-common.mk to avoid duplicating the
file for akita.

Bug: 349877551
Test: $ lunch shiba-trunk_staging-userdebug
      $ get_build_var TARGET_KERNEL_DIR_16K
      device/google/shusky-kernels/5.15/trunk-12022168/16kb
      $ get_build_var BOARD_KERNEL_PATH_16K
      device/google/shusky-kernels/5.15/trunk-12022168/16kb/Image.lz4
      $ get_build_var BOARD_16K_OTA_USE_INCREMENTAL
      true
      $ get_build_var BOARD_16K_OTA_MOVE_VENDOR
      true
Flag: EXEMPT bugfix
Change-Id: I80cb3e9f4c4a1609ca668af554d930edb3b4c5a0
This commit is contained in:
Vilas Bhat 2024-07-01 21:32:35 +00:00
parent 087d2c07ec
commit 2502760f89
3 changed files with 0 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

38
BoardConfig-shusky-common.mk
View file

@ -1,38 +0,0 @@
#
# 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 ($(TARGET_BOOTS_16K),true)
# Configures the 16kb kernel directory.
TARGET_KERNEL_DIR := $(TARGET_KERNEL_DIR)/16kb
else ifeq ($(PRODUCT_16K_DEVELOPER_OPTION),true)
# Configures the 16kb kernel and modules for OTA updates.
TARGET_KERNEL_DIR_16K := $(TARGET_KERNEL_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)))
BOARD_PREBUILT_DTBOIMAGE_16KB := $(TARGET_KERNEL_DIR_16K)/dtbo.img
# 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)))
BOARD_16K_OTA_USE_INCREMENTAL := true
BOARD_16K_OTA_MOVE_VENDOR := true
endif

1
husky/BoardConfig.mk
View file

@ -47,7 +47,6 @@ 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

1
shiba/BoardConfig.mk
View file

@ -43,7 +43,6 @@ 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