raviole: Switch to our own kernel
Change-Id: Iaec4d3704b2b44cd809f24d922f6965312da71e5
This commit is contained in:
committed by
Michael Bestas
parent
502bdb217d
commit
bb65efe2f3
@@ -23,9 +23,9 @@ $(call soong_config_set,raviole_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOA
|
||||
|
||||
|
||||
TARGET_LINUX_KERNEL_VERSION := $(RELEASE_KERNEL_ORIOLE_VERSION)
|
||||
# Keeps flexibility for kasan and ufs builds
|
||||
TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_ORIOLE_DIR)
|
||||
TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_ORIOLE_DIR)/kernel-headers
|
||||
TARGET_KERNEL_DEVICE := raviole
|
||||
TARGET_KERNEL_DIR := device/google/$(TARGET_KERNEL_DEVICE)-kernels/$(TARGET_LINUX_KERNEL_VERSION)
|
||||
TARGET_KERNEL_PLATFORM_SOURCE := google/gs-$(TARGET_LINUX_KERNEL_VERSION)
|
||||
|
||||
DEVICE_PACKAGE_OVERLAYS += device/google/raviole/oriole/overlay
|
||||
|
||||
@@ -48,14 +48,6 @@ PRODUCT_COPY_FILES += \
|
||||
PRODUCT_COPY_FILES += \
|
||||
device/google/gs101/conf/init.recovery.device.rc:$(TARGET_COPY_OUT_RECOVERY)/root/init.recovery.oriole.rc
|
||||
|
||||
# insmod files. Kernel 5.10 prebuilts don't provide these yet, so provide our
|
||||
# own copy if they're not in the prebuilts.
|
||||
# TODO(b/369686096): drop this when 5.10 is gone.
|
||||
ifeq ($(wildcard $(TARGET_KERNEL_DIR)/init.insmod.*.cfg),)
|
||||
PRODUCT_COPY_FILES += \
|
||||
device/google/raviole/init.insmod.oriole.cfg:$(TARGET_COPY_OUT_VENDOR_DLKM)/etc/init.insmod.oriole.cfg
|
||||
endif
|
||||
|
||||
# Thermal Config
|
||||
PRODUCT_COPY_FILES += \
|
||||
device/google/raviole/thermal_info_config_oriole.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config.json \
|
||||
|
||||
@@ -23,9 +23,9 @@ $(call soong_config_set,raviole_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOA
|
||||
|
||||
|
||||
TARGET_LINUX_KERNEL_VERSION := $(RELEASE_KERNEL_RAVEN_VERSION)
|
||||
# Keeps flexibility for kasan and ufs builds
|
||||
TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_RAVEN_DIR)
|
||||
TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_RAVEN_DIR)/kernel-headers
|
||||
TARGET_KERNEL_DEVICE := raviole
|
||||
TARGET_KERNEL_DIR := device/google/$(TARGET_KERNEL_DEVICE)-kernels/$(TARGET_LINUX_KERNEL_VERSION)
|
||||
TARGET_KERNEL_PLATFORM_SOURCE := google/gs-$(TARGET_LINUX_KERNEL_VERSION)
|
||||
|
||||
$(call inherit-product, device/google/raviole/uwb/uwb_calibration_country.mk)
|
||||
|
||||
@@ -55,14 +55,6 @@ PRODUCT_COPY_FILES += \
|
||||
PRODUCT_COPY_FILES += \
|
||||
device/google/gs101/conf/init.recovery.device.rc:$(TARGET_COPY_OUT_RECOVERY)/root/init.recovery.raven.rc
|
||||
|
||||
# insmod files. Kernel 5.10 prebuilts don't provide these yet, so provide our
|
||||
# own copy if they're not in the prebuilts.
|
||||
# TODO(b/369686096): drop this when 5.10 is gone.
|
||||
ifeq ($(wildcard $(TARGET_KERNEL_DIR)/init.insmod.*.cfg),)
|
||||
PRODUCT_COPY_FILES += \
|
||||
device/google/raviole/init.insmod.raven.cfg:$(TARGET_COPY_OUT_VENDOR_DLKM)/etc/init.insmod.raven.cfg
|
||||
endif
|
||||
|
||||
# Thermal Config
|
||||
PRODUCT_COPY_FILES += \
|
||||
device/google/raviole/thermal_info_config_raven.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config.json \
|
||||
|
||||
@@ -1,17 +0,0 @@
|
||||
##########################################################
|
||||
# init.insmod.oriole.cfg #
|
||||
# This file contains oriole specific kernel modules to #
|
||||
# load at init time by init.insmod.sh script #
|
||||
##########################################################
|
||||
|
||||
# Load device specific kernel modules
|
||||
# Modules here will be loaded *after* all common modules
|
||||
modprobe|bcmdhd4389.ko
|
||||
modprobe|ftm5.ko
|
||||
modprobe|sec_touch.ko
|
||||
modprobe|st33spi.ko
|
||||
|
||||
# All device specific modules loaded
|
||||
setprop|vendor.device.modules.ready
|
||||
setprop|vendor.all.modules.ready
|
||||
setprop|vendor.all.devices.ready
|
||||
@@ -1,16 +0,0 @@
|
||||
##########################################################
|
||||
# init.insmod.raven.cfg #
|
||||
# This file contains raven specific kernel modules to #
|
||||
# load at init time by init.insmod.sh script #
|
||||
##########################################################
|
||||
|
||||
# Load device specific kernel modules
|
||||
# Modules here will be loaded *after* all common modules
|
||||
modprobe|bcmdhd4389.ko
|
||||
modprobe|sec_touch.ko
|
||||
modprobe|st33spi.ko
|
||||
|
||||
# All device specific modules loaded
|
||||
setprop|vendor.device.modules.ready
|
||||
setprop|vendor.all.modules.ready
|
||||
setprop|vendor.all.devices.ready
|
||||
@@ -2,5 +2,9 @@
|
||||
{
|
||||
"repository": "android_device_google_gs101",
|
||||
"target_path": "device/google/gs101"
|
||||
},
|
||||
{
|
||||
"repository": "android_device_google_raviole-kernels",
|
||||
"target_path": "device/google/raviole-kernels"
|
||||
}
|
||||
]
|
||||
|
||||
Reference in New Issue
Block a user