Merge "build: config: Add build support for Niobe TUIVM"

build.config.msm.niobe.tuivm

@@ -0,0 +1,9 @@
+################################################################################
+## Inheriting MSM configs
+. "${KERNEL_DIR}"/build.config.msm.niobe.vm
+################################################################################
+
+MKDTIMGDTBS=()
+MKDTIMGDTBS["niobe_tuivm"]="niobe-vm"
+
+################################################################################

build.config.msm.niobe.vm

@@ -0,0 +1,36 @@
+################################################################################
+## Inheriting configs from ACK
+. "${ROOT_DIR}"/common/build.config.common
+. "${ROOT_DIR}"/common/build.config.aarch64
+
+################################################################################
+## Variant setup
+MSM_ARCH=niobe_tuivm
+VARIANTS=(defconfig debug_defconfig)
+[ -z "${VARIANT}" ] && VARIANT=debug_defconfig
+
+if [ -e "${ROOT_DIR}/msm-kernel" ] && [ "${KERNEL_DIR}" = "common" ]; then
+	KERNEL_DIR="msm-kernel"
+fi
+
+BOOT_IMAGE_HEADER_VERSION=3
+BASE_ADDRESS=0x80000000
+PAGE_SIZE=4096
+VM_DTB_IMG_CREATE=1
+PREFERRED_USERSPACE=vm
+
+declare -A MKDTIMGDTBS
+
+################################################################################
+## Define TUI VM parameters
+TUIVM_KERNEL_OFFSET=0x0
+TUIVM_DTB_OFFSET=0x2000000
+TUIVM_RAMDISK_OFFSET=0x2100000
+TUIVM_CMDLINE_CPIO_OFFSET=0x2100000
+
+MKDTIMGDTBS["niobe_tuivm"]="niobe-vm"
+
+################################################################################
+## Inheriting MSM configs
+. "${KERNEL_DIR}"/build.config.msm.common
+. "${KERNEL_DIR}"/build.config.msm.vm

build.targets

@@ -6,6 +6,7 @@ build.config.msm.niobe
 build.config.msm.kalama
 build.config.msm.pineapple.vm
 build.config.msm.kalama.vm
+build.config.msm.niobe.vm
 build.config.msm.pineapple.allyes
 build.config.msm.blair
 build.config.msm.gen3auto

msm_platforms.bzl

@@ -10,6 +10,7 @@ load(":pineapple_tuivm.bzl", "define_pineapple_tuivm")
 load(":pineapple_oemvm.bzl", "define_pineapple_oemvm")
 load(":pineapple_vms.bzl", "define_pineapple_vms")
 load(":pineapple_allyes.bzl", "define_pineapple_allyes")
+load(":niobe_tuivm.bzl", "define_niobe_tuivm")
 load(":msm_common.bzl", "define_signing_keys")
 load("//build:msm_kernel_extensions.bzl", "define_top_level_rules")
 load(":blair.bzl", "define_blair")
@@ -31,6 +32,7 @@ def define_msm_platforms():
     define_pineapple_oemvm()
     define_pineapple_allyes()
     define_pineapple_vms()
+    define_niobe_tuivm()
     define_blair()
     define_pitti()
     define_anorak()

niobe_tuivm.bzl

@@ -0,0 +1,11 @@
+load(":target_variants.bzl", "vm_variants")
+load(":msm_kernel_vm.bzl", "define_msm_vm")
+
+target_name = "niobe-tuivm"
+
+def define_niobe_tuivm():
+    for variant in vm_variants:
+        define_msm_vm(
+            msm_target = target_name,
+            variant = variant,
+        )

target_variants.bzl

@@ -44,11 +44,16 @@ vm_types = [
     "oemvm",
 ]
 
-vm_target_bases = [
-    "pineapple",
+niobe_vm_types = [
+    "tuivm",
 ]
 
-vm_targets = ["{}-{}".format(t, vt) for t in vm_target_bases for vt in vm_types]
+vm_target_bases = {
+    "pineapple": vm_types,
+    "niobe": niobe_vm_types,
+}
+
+vm_targets = ["{}-{}".format(t, vt) for t in vm_target_bases.keys() for vt in vm_target_bases[t]]
 
 vm_variants = [
     # keep sorted