diff options
| author | Ashish Bhimanpalliwar <quic_abhiman@quicinc.com> | 2022-06-16 13:10:47 +0530 |
|---|---|---|
| committer | Ashish Bhimanpalliwar <quic_abhiman@quicinc.com> | 2022-06-28 17:07:40 +0530 |
| commit | 59c5f90fc919c5b2ee6d4f991e58325225b22a23 (patch) | |
| tree | af2aa5a787834f4049d96a1c935fda7994cbb807 | |
| parent | d12e5b53db6c79373fa7684198fac99734cb0467 (diff) | |
QcomModulePkg: Add support to disable display
Add support to disable display.It was removed due to
a regression which got in due to this commit
ae409551a96092cad9ba4cb921280429449b3923
Change-Id: I9c9240f1b9303267bba0c196902e0ea3ad126f38
| -rw-r--r-- | AndroidBoot.mk | 15 | ||||
| -rw-r--r-- | QcomModulePkg/Library/BootLib/BootLinux.c | 4 | ||||
| -rwxr-xr-x | QcomModulePkg/QcomModulePkg.dsc | 6 | ||||
| -rw-r--r-- | makefile | 2 |
4 files changed, 17 insertions, 10 deletions
diff --git a/AndroidBoot.mk b/AndroidBoot.mk index fb1b103f01..23eca0c5b4 100644 --- a/AndroidBoot.mk +++ b/AndroidBoot.mk @@ -76,11 +76,18 @@ else BOARD_BOOTLOADER_PRODUCT_NAME := QC_Reference_Phone endif -ifneq ($(TARGET_BOARD_TYPE),auto) - TARGET_BOARD_TYPE_AUTO := TARGET_BOARD_TYPE_AUTO=0 +ifeq ($(TARGET_BOARD_TYPE),auto) + DISPLAY_DISABLE := DISPLAY_DISABLE=1 else - TARGET_BOARD_TYPE_AUTO := TARGET_BOARD_TYPE_AUTO=1 + DISPLAY_DISABLE := DISPLAY_DISABLE=0 endif + +ifeq ($(TARGET_BOOTLOADER_DISPLAY_DISABLE),true) + DISPLAY_DISABLE := DISPLAY_DISABLE=1 +else + DISPLAY_DISABLE := DISPLAY_DISABLE=0 +endif + ifeq ($(BOARD_ABL_SAFESTACK_DISABLE),true) ABL_SAFESTACK := false else @@ -183,8 +190,8 @@ $(TARGET_ABL): $(LOCAL_ABL_SRC_FILE) $(LOCAL_ABL_TOOLS) | $(ABL_OUT) $(INSTALLED $(DISABLE_PARALLEL_DOWNLOAD_FLASH) \ $(AB_RETRYCOUNT_DISABLE) \ $(DYNAMIC_PARTITION_SUPPORT) \ - $(TARGET_BOARD_TYPE_AUTO) \ $(VIRTUAL_AB_OTA) \ + $(DISPLAY_DISABLE) \ $(BUILD_USES_RECOVERY_AS_BOOT) \ CLANG_BIN=$(CLANG_BIN) \ CLANG_PREFIX=$(CLANG35_PREFIX)\ diff --git a/QcomModulePkg/Library/BootLib/BootLinux.c b/QcomModulePkg/Library/BootLib/BootLinux.c index 0bf2f586be..3c5c8326b0 100644 --- a/QcomModulePkg/Library/BootLib/BootLinux.c +++ b/QcomModulePkg/Library/BootLib/BootLinux.c @@ -1837,7 +1837,7 @@ BOOLEAN IsNANDSquashFsSupport (VOID) } #endif -#if TARGET_BOARD_TYPE_AUTO +#if DISPLAY_DISABLE BOOLEAN IsEnableDisplayMenuFlagSupported (VOID) { return FALSE; @@ -1845,6 +1845,6 @@ BOOLEAN IsEnableDisplayMenuFlagSupported (VOID) #else BOOLEAN IsEnableDisplayMenuFlagSupported (VOID) { - return TRUE; + return FixedPcdGetBool (EnableDisplayMenu); } #endif diff --git a/QcomModulePkg/QcomModulePkg.dsc b/QcomModulePkg/QcomModulePkg.dsc index 31b38708bb..3600aba209 100755 --- a/QcomModulePkg/QcomModulePkg.dsc +++ b/QcomModulePkg/QcomModulePkg.dsc @@ -102,12 +102,12 @@ !if $(VERIFIED_BOOT_LE) GCC:*_*_*_CC_FLAGS = -DVERIFIED_BOOT_LE !endif + !if $(DISPLAY_DISABLE) + GCC:*_*_*_CC_FLAGS = -DDISPLAY_DISABLE + !endif !if $(AB_RETRYCOUNT_DISABLE) GCC:*_*_*_CC_FLAGS = -DAB_RETRYCOUNT_DISABLE !endif - !if $(TARGET_BOARD_TYPE_AUTO) == "1" - GCC:*_*_*_CC_FLAGS = -DTARGET_BOARD_TYPE_AUTO - !endif !if $(VERITY_LE) GCC:*_*_*_CC_FLAGS = -DVERITY_LE !endif @@ -138,7 +138,7 @@ ABL_FV_IMG: EDK_TOOLS_BIN -D VERIFIED_BOOT_2=$(VERIFIED_BOOT_2) \ -D VERIFIED_BOOT_LE=$(VERIFIED_BOOT_LE) \ -D AB_RETRYCOUNT_DISABLE=$(AB_RETRYCOUNT_DISABLE) \ - -D TARGET_BOARD_TYPE_AUTO=$(TARGET_BOARD_TYPE_AUTO) \ + -D DISPLAY_DISABLE=$(DISPLAY_DISABLE) \ -D VERITY_LE=$(VERITY_LE) \ -D VERITY_LE_USE_EXT4_GLUEBI=$(VERITY_LE_USE_EXT4_GLUEBI) \ -D USER_BUILD_VARIANT=$(USER_BUILD_VARIANT) \ |