From 11e866daadc3cfb06511a819ce2017a478f74dbc Mon Sep 17 00:00:00 2001 From: Cyan_Hsieh Date: Wed, 1 May 2024 18:19:05 +0800 Subject: [PATCH] Update bootloader pdk folder and soong config Bug: 333834221 Change-Id: I0f26803489893fa33e5ef440b33a3ff0a3b79fc6 --- cheetah/BoardConfig.mk | 9 +++++++-- cloudripper/BoardConfig.mk | 9 +++++++-- panther/BoardConfig.mk | 9 +++++++-- ravenclaw/BoardConfig.mk | 9 +++++++-- 4 files changed, 28 insertions(+), 8 deletions(-) diff --git a/cheetah/BoardConfig.mk b/cheetah/BoardConfig.mk index f3939a1..6f7f2d5 100644 --- a/cheetah/BoardConfig.mk +++ b/cheetah/BoardConfig.mk @@ -18,9 +18,14 @@ BOARD_BOOTCONFIG += androidboot.load_modules_parallel=true RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_CHEETAH_RADIO_DIR) -RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR ?= trunk # Keep this for pdk TODO: b/327119000 +RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR ?= pdk# Keep this for pdk TODO: b/327119000 RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR) -$(call soong_config_set,bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR)) +$(call soong_config_set,pantah_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR)) +ifneq ($(filter trunk%, $(RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR)),) +$(call soong_config_set,pantah_fingerprint,prebuilt_dir,trunk) +else +$(call soong_config_set,pantah_fingerprint,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR)) +endif # The modules which need to be loaded in sequential BOARD_KERNEL_CMDLINE += fips140.load_sequential=1 diff --git a/cloudripper/BoardConfig.mk b/cloudripper/BoardConfig.mk index 33e7706..d923b44 100644 --- a/cloudripper/BoardConfig.mk +++ b/cloudripper/BoardConfig.mk @@ -15,9 +15,14 @@ # TARGET_BOARD_INFO_FILE := device/google/pantah/board-info.txt TARGET_BOOTLOADER_BOARD_NAME := cloudripper -RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR ?= trunk # Keep this for pdk TODO: b/327119000 +RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR ?= pdk# Keep this for pdk TODO: b/327119000 RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR) -$(call soong_config_set,bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR)) +$(call soong_config_set,pantah_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR)) +ifneq ($(filter trunk%, $(RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR)),) +$(call soong_config_set,pantah_fingerprint,prebuilt_dir,trunk) +else +$(call soong_config_set,pantah_fingerprint,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR)) +endif TARGET_SCREEN_DENSITY := 440 BOARD_USES_GENERIC_AUDIO := true USES_DEVICE_GOOGLE_CLOUDRIPPER := true diff --git a/panther/BoardConfig.mk b/panther/BoardConfig.mk index 2d2b54f..34c72d7 100644 --- a/panther/BoardConfig.mk +++ b/panther/BoardConfig.mk @@ -22,9 +22,14 @@ BOARD_KERNEL_CMDLINE += fips140.load_sequential=1 BOARD_KERNEL_CMDLINE += exynos_drm.load_sequential=1 RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_PANTHER_RADIO_DIR) -RELEASE_GOOGLE_BOOTLOADER_PANTHER_DIR ?= trunk # Keep this for pdk TODO: b/327119000 +RELEASE_GOOGLE_BOOTLOADER_PANTHER_DIR ?= pdk# Keep this for pdk TODO: b/327119000 RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_PANTHER_DIR) -$(call soong_config_set,bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_PANTHER_DIR)) +$(call soong_config_set,pantah_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_PANTHER_DIR)) +ifneq ($(filter trunk%, $(RELEASE_GOOGLE_BOOTLOADER_PANTHER_DIR)),) +$(call soong_config_set,pantah_fingerprint,prebuilt_dir,trunk) +else +$(call soong_config_set,pantah_fingerprint,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_PANTHER_DIR)) +endif ifdef PHONE_CAR_BOARD_PRODUCT include device/google_car/$(PHONE_CAR_BOARD_PRODUCT)/BoardConfig.mk diff --git a/ravenclaw/BoardConfig.mk b/ravenclaw/BoardConfig.mk index 722dbc6..0ead4dc 100644 --- a/ravenclaw/BoardConfig.mk +++ b/ravenclaw/BoardConfig.mk @@ -15,9 +15,14 @@ # TARGET_BOARD_INFO_FILE := device/google/pantah/board-info.txt TARGET_BOOTLOADER_BOARD_NAME := ravenclaw -RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR ?= trunk # Keep this for pdk TODO: b/327119000 +RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR ?= pdk# Keep this for pdk TODO: b/327119000 RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR) -$(call soong_config_set,bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR)) +$(call soong_config_set,pantah_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR)) +ifneq ($(filter trunk%, $(RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR)),) +$(call soong_config_set,pantah_fingerprint,prebuilt_dir,trunk) +else +$(call soong_config_set,pantah_fingerprint,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR)) +endif TARGET_SCREEN_DENSITY := 560 BOARD_USES_GENERIC_AUDIO := true USES_DEVICE_GOOGLE_CLOUDRIPPER := true