From 7ea485bd00a53b8c01b095b3a61ad22266150f79 Mon Sep 17 00:00:00 2001
From: Jason Chiu <jasoncschiu@google.com>
Date: Wed, 29 Sep 2021 07:17:17 +0000
Subject: [PATCH] Revert "gs101: re-enable prebuilt boot.img/boot-user.img
 usage"

This reverts commit 7badc4b5f1c7b6adff8cd9142f5c97bd4a5a0d49.

Reason for revert: it introduce b/201469630 and b/201476061

Bug: 201469630
Bug: 201476061
Change-Id: Id48ea931410a55bfd382feb7a0da02994fdf8928
(cherry picked from commit 48a5fe4304e3c5720f468d6b9147ca36bbe9eb4e)
---
 BoardConfig-common.mk | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index d0d62790..9a11aa43 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -53,17 +53,8 @@ BOARD_KERNEL_CMDLINE += stack_depot_disable=off page_pinner=on
 BOARD_BOOTCONFIG += androidboot.boot_devices=14700000.ufs
 
 TARGET_NO_BOOTLOADER := true
-TARGET_NO_RADIOIMAGE := true
-ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT)))
-BOARD_PREBUILT_BOOTIMAGE := $(wildcard $(TARGET_KERNEL_DIR)/boot.img)
-else
-BOARD_PREBUILT_BOOTIMAGE := $(wildcard $(TARGET_KERNEL_DIR)/boot-user.img)
-endif
-ifneq (,$(BOARD_PREBUILT_BOOTIMAGE))
-TARGET_NO_KERNEL := true
-else
 TARGET_NO_KERNEL := false
-endif
+TARGET_NO_RADIOIMAGE := true
 BOARD_USES_GENERIC_KERNEL_IMAGE := true
 BOARD_MOVE_RECOVERY_RESOURCES_TO_VENDOR_BOOT := true
 BOARD_MOVE_GSI_AVB_KEYS_TO_VENDOR_BOOT := true