From bed3a2145731cf7bc6455a0ee2926079dc81a073 Mon Sep 17 00:00:00 2001 From: Satish Yalla Date: Wed, 15 Jan 2025 20:33:59 -0800 Subject: [PATCH] Revert "Move 16 KB dev option configs" Revert submission 31286550-fix_16kb_dir_and_ufs_targets Reason for revert: Droidmonitor created revert due to b/390233619 .Will be verified through ABTD for standarrd investigation. Reverted changes: /q/submissionid:31286550-fix_16kb_dir_and_ufs_targets Change-Id: I89195cb7a33dd13af12ee67f13c9d7dc0dfa94f5 --- BoardConfig-16k-common.mk | 31 ------------------------------- 1 file changed, 31 deletions(-) diff --git a/BoardConfig-16k-common.mk b/BoardConfig-16k-common.mk index 67a012a..229248d 100644 --- a/BoardConfig-16k-common.mk +++ b/BoardConfig-16k-common.mk @@ -16,35 +16,4 @@ ifeq ($(TARGET_BOOTS_16K),true) BOARD_F2FS_BLOCKSIZE := 16384 -# 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 - -# The 16kb mode does not use these modules. -BOARD_KERNEL_MODULES_16K := $(filter-out %/bcm_dbg.ko,$(BOARD_KERNEL_MODULES_16K)) -BOARD_KERNEL_MODULES_16K := $(filter-out %/zram.ko,$(BOARD_KERNEL_MODULES_16K)) -BOARD_KERNEL_MODULES_16K := $(filter-out %/aoc_unit_test_dev.ko,$(BOARD_KERNEL_MODULES_16K)) -BOARD_KERNEL_MODULES_16K := $(filter-out %/gs-panel-common-test.ko,$(BOARD_KERNEL_MODULES_16K)) -BOARD_KERNEL_MODULES_16K := $(filter-out %/mali_kutf.ko,$(BOARD_KERNEL_MODULES_16K)) -BOARD_KERNEL_MODULES_16K := $(filter-out %/mali_kutf_clk_rate_trace_test_portal.ko,$(BOARD_KERNEL_MODULES_16K)) -BOARD_KERNEL_MODULES_16K := $(filter-out %/panel-gs-tk4c-test.ko,$(BOARD_KERNEL_MODULES_16K)) -BOARD_KERNEL_MODULES_16K := $(filter-out %/pwm-exynos.ko,$(BOARD_KERNEL_MODULES_16K)) -BOARD_KERNEL_MODULES_16K := $(filter-out %/rt4539_bl.ko,$(BOARD_KERNEL_MODULES_16K)) -BOARD_KERNEL_MODULES_16K := $(filter-out %/sec_touch.ko,$(BOARD_KERNEL_MODULES_16K)) -BOARD_KERNEL_MODULES_16K := $(filter-out %/sscoredump_sample_test.ko,$(BOARD_KERNEL_MODULES_16K)) -BOARD_KERNEL_MODULES_16K := $(filter-out %/sscoredump_test.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