From d0036d6f2196ea7ee2a2b336f5e5646099784dae Mon Sep 17 00:00:00 2001 From: Cong Zhang Date: Fri, 17 Mar 2023 17:08:29 +0800 Subject: [PATCH] build: Add support for CPIO cmdline support Add support for CPIO cmdline support to remove ramdisk of SVMs. Change-Id: Ie0bcdfd66f94972c6b72a2285af538a6f4f37173 Signed-off-by: Cong Zhang --- build.config.msm.pineapple.vm | 2 ++ image_opts.bzl | 2 ++ msm_kernel_vm.bzl | 2 ++ 3 files changed, 6 insertions(+) diff --git a/build.config.msm.pineapple.vm b/build.config.msm.pineapple.vm index 30855b725819..84dc71962bf7 100644 --- a/build.config.msm.pineapple.vm +++ b/build.config.msm.pineapple.vm @@ -26,6 +26,7 @@ declare -A MKDTIMGDTBS TUIVM_KERNEL_OFFSET=0x0 TUIVM_DTB_OFFSET=0x2000000 TUIVM_RAMDISK_OFFSET=0x2100000 +TUIVM_CMDLINE_CPIO_OFFSET=0x2100000 MKDTIMGDTBS["pineapple_tuivm"]="pineapple-vm" @@ -34,6 +35,7 @@ MKDTIMGDTBS["pineapple_tuivm"]="pineapple-vm" OEMVM_KERNEL_OFFSET=0x0 OEMVM_DTB_OFFSET=0x2000000 OEMVM_RAMDISK_OFFSET=0x2100000 +OEMVM_CMDLINE_CPIO_OFFSET=0x2100000 MKDTIMGDTBS["pineapple_oemvm"]="pineapple-oemvm" diff --git a/image_opts.bzl b/image_opts.bzl index 468411b32f0a..7cc4e3e44dd9 100644 --- a/image_opts.bzl +++ b/image_opts.bzl @@ -18,6 +18,7 @@ def vm_image_opts( kernel_offset = 0x0, dtb_offset = 0x2000000, ramdisk_offset = 0x2100000, + cmdline_cpio_offset = 0x2100000, vm_size_ext4 = 270000000, dummy_img_size = 4096): return struct( @@ -26,6 +27,7 @@ def vm_image_opts( kernel_offset = kernel_offset, dtb_offset = dtb_offset, ramdisk_offset = ramdisk_offset, + cmdline_cpio_offset = cmdline_cpio_offset, vm_size_ext4 = vm_size_ext4, dummy_img_size = dummy_img_size, ) diff --git a/msm_kernel_vm.bzl b/msm_kernel_vm.bzl index 77d74ecb8387..424e72571ff6 100644 --- a/msm_kernel_vm.bzl +++ b/msm_kernel_vm.bzl @@ -78,6 +78,7 @@ VM_DTB_IMG_CREATE=%d KERNEL_OFFSET=0x%X DTB_OFFSET=0x%X RAMDISK_OFFSET=0x%X +CMDLINE_CPIO_OFFSET=0x%X VM_SIZE_EXT4=%d DUMMY_IMG_SIZE=%d @@ -92,6 +93,7 @@ EOF vm_image_opts.kernel_offset, # KERNEL_OFFSET vm_image_opts.dtb_offset, # DTB_OFFSET vm_image_opts.ramdisk_offset, # RAMDISK_OFFSET + vm_image_opts.cmdline_cpio_offset, # CMDLINE_CPIO_OFFSET vm_image_opts.vm_size_ext4, # VM_SIZE_EXT4 vm_image_opts.dummy_img_size, # DUMMY_IMG_SIZE )