aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorViktor Martensson <vmartensson@google.com>2024-05-24 22:12:12 +0000
committerViktor Martensson <vmartensson@google.com>2024-05-24 22:22:57 +0000
commit2fe9cdfb4f218544444cd95b6245113cfcf321d0 (patch)
tree38f9006b63c8a474b77630780759d36c622d8129
parentfe0c9bffbaa96b4e76bca18d02c2c52463431ae4 (diff)
downloadcuttlefish-main.tar.gz
Switch most targets to 6.6, exclude TV, Wear and GoHEADmastermain
Bug: 321809069 Test: Treehugger Change-Id: I47c0d4a9bb9ae7d638cd3a58d3d6376e1bb99758 Signed-off-by: Viktor Martensson <vmartensson@google.com>
-rw-r--r--shared/BoardConfig.mk11
1 files changed, 11 insertions, 0 deletions
diff --git a/shared/BoardConfig.mk b/shared/BoardConfig.mk
index a6f46bfff..c5accd10d 100644
--- a/shared/BoardConfig.mk
+++ b/shared/BoardConfig.mk
@@ -18,7 +18,18 @@
# Common BoardConfig for all supported architectures.
#
+# Some targets still require 32 bit, and 6.6 kernels don't support
+# 32 bit devices (Wear, Go, Auto)
+ifneq (,$(findstring gwear_x86,$(PRODUCT_NAME)))
TARGET_KERNEL_USE ?= 6.1
+else ifneq (,$(findstring x86_phone,$(PRODUCT_NAME)))
+TARGET_KERNEL_USE ?= 6.1
+else ifneq (,$(findstring x86_tv,$(PRODUCT_NAME)))
+TARGET_KERNEL_USE ?= 6.1
+else
+TARGET_KERNEL_USE ?= 6.6
+endif
+
TARGET_KERNEL_ARCH ?= $(TARGET_ARCH)
SYSTEM_DLKM_SRC ?= kernel/prebuilts/$(TARGET_KERNEL_USE)/$(TARGET_KERNEL_ARCH)
TARGET_KERNEL_PATH ?= $(SYSTEM_DLKM_SRC)/kernel-$(TARGET_KERNEL_USE)