From 9c4a0ea67f5db1db2c2bd1eb888dd03c59e01b56 Mon Sep 17 00:00:00 2001 From: Steve Muckle Date: Tue, 16 Jun 2020 17:09:23 -0700 Subject: [PATCH] add 4.19 kernel to aosp_arm64 Create a 4.19 kernel GKI boot image. Bug: 158791155 Change-Id: I2dcfe29f2e8414c0362992a6e6ca68a86f367d4e --- target/board/generic_arm64/BoardConfig.mk | 3 ++- target/board/generic_arm64/device.mk | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/target/board/generic_arm64/BoardConfig.mk b/target/board/generic_arm64/BoardConfig.mk index 2963ee455..0ac2f9419 100644 --- a/target/board/generic_arm64/BoardConfig.mk +++ b/target/board/generic_arm64/BoardConfig.mk @@ -58,6 +58,7 @@ TARGET_NO_KERNEL := false TARGET_NO_VENDOR_BOOT := true BOARD_USES_RECOVERY_AS_BOOT := true +BOARD_KERNEL-4.19-GZ_BOOTIMAGE_PARTITION_SIZE := 47185920 BOARD_KERNEL-5.4_BOOTIMAGE_PARTITION_SIZE := 67108864 BOARD_KERNEL-5.4-GZ_BOOTIMAGE_PARTITION_SIZE := 47185920 BOARD_KERNEL-5.4-LZ4_BOOTIMAGE_PARTITION_SIZE := 53477376 @@ -66,7 +67,7 @@ BOARD_USERDATAIMAGE_PARTITION_SIZE := 576716800 BOARD_BOOT_HEADER_VERSION := 3 BOARD_MKBOOTIMG_ARGS += --header_version $(BOARD_BOOT_HEADER_VERSION) -BOARD_KERNEL_BINARIES := kernel-5.4 kernel-5.4-gz kernel-5.4-lz4 +BOARD_KERNEL_BINARIES := kernel-4.19-gz kernel-5.4 kernel-5.4-gz kernel-5.4-lz4 # Some vendors still haven't cleaned up all device specific directories under # root! diff --git a/target/board/generic_arm64/device.mk b/target/board/generic_arm64/device.mk index 3b7cd44ac..d96bfc2cf 100644 --- a/target/board/generic_arm64/device.mk +++ b/target/board/generic_arm64/device.mk @@ -15,6 +15,7 @@ # PRODUCT_COPY_FILES += \ + kernel/prebuilts/4.19/arm64/Image.gz:kernel-4.19-gz \ device/google/cuttlefish_kernel/5.4-arm64/kernel-5.4:kernel-5.4 \ device/google/cuttlefish_kernel/5.4-arm64/kernel-5.4-gz:kernel-5.4-gz \ device/google/cuttlefish_kernel/5.4-arm64/kernel-5.4-lz4:kernel-5.4-lz4