From 814976be07d2ab68aea8dde5abf190730f354676 Mon Sep 17 00:00:00 2001 From: Amrit Anand Date: Tue, 12 Sep 2023 15:00:52 +0530 Subject: [PATCH] build: bazel: Enable compilation for Niobe SoC Add initial files to build Niobe with bazel. Change-Id: I2c0a2872d589ef6d328088a2b3f879644d8ea60c Signed-off-by: Amrit Anand --- arch/arm64/configs/vendor/niobe_GKI.config | 1 - build.config.msm.niobe | 33 +++++++++++ build.targets | 1 + modules.list.msm.niobe | 2 + modules.systemdlkm_blocklist.msm.niobe | 3 + modules.vendor_blocklist.msm.niobe | 65 ++++++++++++++++++++++ msm_platforms.bzl | 2 + niobe.bzl | 52 +++++++++++++++++ target_variants.bzl | 1 + 9 files changed, 159 insertions(+), 1 deletion(-) create mode 100644 build.config.msm.niobe create mode 100644 modules.list.msm.niobe create mode 100644 modules.systemdlkm_blocklist.msm.niobe create mode 100644 modules.vendor_blocklist.msm.niobe create mode 100644 niobe.bzl diff --git a/arch/arm64/configs/vendor/niobe_GKI.config b/arch/arm64/configs/vendor/niobe_GKI.config index a99c56814cb2..b7398f4a895d 100644 --- a/arch/arm64/configs/vendor/niobe_GKI.config +++ b/arch/arm64/configs/vendor/niobe_GKI.config @@ -1,4 +1,3 @@ CONFIG_ARCH_NIOBE=y -CONFIG_ARCH_QCOM=y CONFIG_LOCALVERSION="-gki" # CONFIG_MODULE_SIG_ALL is not set diff --git a/build.config.msm.niobe b/build.config.msm.niobe new file mode 100644 index 000000000000..e6611cd79af7 --- /dev/null +++ b/build.config.msm.niobe @@ -0,0 +1,33 @@ +################################################################################ +## Inheriting configs from ACK +. ${ROOT_DIR}/msm-kernel/build.config.common +. ${ROOT_DIR}/msm-kernel/build.config.aarch64 + +################################################################################ +## Variant setup +MSM_ARCH=niobe +VARIANTS=(consolidate gki) +[ -z "${VARIANT}" ] && VARIANT=consolidate + +ABL_SRC=bootable/bootloader/edk2 +BOOT_IMAGE_HEADER_VERSION=4 +BASE_ADDRESS=0x80000000 +PAGE_SIZE=4096 +BUILD_VENDOR_DLKM=1 +PREPARE_SYSTEM_DLKM=1 +SYSTEM_DLKM_MODULES_LIST=${ROOT_DIR}/${KERNEL_DIR}/android/gki_system_dlkm_modules +SUPER_IMAGE_SIZE=0x10000000 +TRIM_UNUSED_MODULES=1 +BUILD_INIT_BOOT_IMG=1 +[ -z "${DT_OVERLAY_SUPPORT}" ] && DT_OVERLAY_SUPPORT=1 + +if [ "${KERNEL_CMDLINE_CONSOLE_AUTO}" != "0" ]; then + KERNEL_VENDOR_CMDLINE+='console=ttyMSM0,115200n8 earlycon' +fi + +KERNEL_VENDOR_CMDLINE+=' bootconfig ' + +################################################################################ +## Inheriting MSM configs +. ${KERNEL_DIR}/build.config.msm.common +. ${KERNEL_DIR}/build.config.msm.gki diff --git a/build.targets b/build.targets index 9c921921e3b0..da48e3ce71d9 100644 --- a/build.targets +++ b/build.targets @@ -1,5 +1,6 @@ build.config.msm.autogvm build.config.msm.pineapple +build.config.msm.niobe build.config.msm.kalama build.config.msm.pineapple.vm build.config.msm.kalama.vm diff --git a/modules.list.msm.niobe b/modules.list.msm.niobe new file mode 100644 index 000000000000..f679895bc362 --- /dev/null +++ b/modules.list.msm.niobe @@ -0,0 +1,2 @@ +# SPDX-License-Identifier: GPL-2.0-only +# Copyright (c) 2023, Qualcomm Innovation Center, Inc. All rights reserved. diff --git a/modules.systemdlkm_blocklist.msm.niobe b/modules.systemdlkm_blocklist.msm.niobe new file mode 100644 index 000000000000..c2a067991945 --- /dev/null +++ b/modules.systemdlkm_blocklist.msm.niobe @@ -0,0 +1,3 @@ +# SPDX-License-Identifier: GPL-2.0-only +# Copyright (c) 2023, Qualcomm Innovation Center, Inc. All rights reserved. + diff --git a/modules.vendor_blocklist.msm.niobe b/modules.vendor_blocklist.msm.niobe new file mode 100644 index 000000000000..43fd1ed60f10 --- /dev/null +++ b/modules.vendor_blocklist.msm.niobe @@ -0,0 +1,65 @@ +# SPDX-License-Identifier: GPL-2.0-only +# Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. + +blocklist 8250_of +blocklist adc-tm +blocklist atomic64_test +blocklist can-bcm +blocklist can-gw +blocklist can-raw +blocklist dummy-cpufreq +blocklist dummy_hcd +blocklist dummy_hcd +blocklist e4000 +blocklist failover +blocklist fc0011 +blocklist fc0012 +blocklist fc0013 +blocklist fc2580 +blocklist it913x +blocklist kheaders +blocklist limits_stat +blocklist lkdtm +blocklist llcc_perfmon +blocklist locktorture +blocklist m88rs6000t +blocklist max2165 +blocklist mc44s803 +blocklist mmrm_test_module +blocklist msi001 +blocklist mt2060 +blocklist mt2063 +blocklist mt20xx +blocklist mt2131 +blocklist mt2266 +blocklist mxl301rf +blocklist net_failover +blocklist qca_cld3_kiwi +blocklist qm1d1b0004 +blocklist qm1d1c0042 +blocklist qt1010 +blocklist r820t +blocklist rcutorture +blocklist rtc-test +blocklist si2157 +blocklist tda18212 +blocklist tda18218 +blocklist tda18250 +blocklist tda18271 +blocklist tda827x +blocklist tda8290 +blocklist tda9887 +blocklist tea5761 +blocklist tea5767 +blocklist test_user_copy +blocklist torture +blocklist tua9001 +blocklist tuner-simple +blocklist tuner-types +blocklist tuner-xc2028 +blocklist vmw_vsock_virtio_transport +blocklist vmw_vsock_virtio_transport_common +blocklist vsock +blocklist vsock_diag +blocklist xc4000 +blocklist xc5000 diff --git a/msm_platforms.bzl b/msm_platforms.bzl index dc108343f520..bbd831369384 100644 --- a/msm_platforms.bzl +++ b/msm_platforms.bzl @@ -4,6 +4,7 @@ load(":autogvm_lxc.bzl", "define_autogvm_lxc") load(":gen4auto_lxc.bzl", "define_gen4auto_lxc") load(":sdmsteppeauto.bzl", "define_sdmsteppeauto") load(":pineapple.bzl", "define_pineapple") +load(":niobe.bzl", "define_niobe") load(":pineapple_tuivm.bzl", "define_pineapple_tuivm") load(":pineapple_oemvm.bzl", "define_pineapple_oemvm") load(":pineapple_vms.bzl", "define_pineapple_vms") @@ -22,6 +23,7 @@ def define_msm_platforms(): define_gen4auto_lxc() define_sdmsteppeauto() define_pineapple() + define_niobe() define_pineapple_tuivm() define_pineapple_oemvm() define_pineapple_allyes() diff --git a/niobe.bzl b/niobe.bzl new file mode 100644 index 000000000000..28e27b2ae601 --- /dev/null +++ b/niobe.bzl @@ -0,0 +1,52 @@ +load(":target_variants.bzl", "la_variants") +load(":msm_kernel_la.bzl", "define_msm_la") +load(":image_opts.bzl", "boot_image_opts") + +target_name = "niobe" + +def define_niobe(): + _niobe_in_tree_modules = [ + # keep sorted + # TODO: Need to add GKI modules + ] + + _niobe_consolidate_in_tree_modules = _niobe_in_tree_modules + [ + # keep sorted + "drivers/misc/lkdtm/lkdtm.ko", + "kernel/locking/locktorture.ko", + "kernel/rcu/rcutorture.ko", + "kernel/torture.ko", + "lib/atomic64_test.ko", + "lib/test_user_copy.ko", + ] + + kernel_vendor_cmdline_extras = [ + # do not sort + "console=ttyMSM0,115200n8", + "qcom_geni_serial.con_enabled=1", + "bootconfig", + ] + + board_kernel_cmdline_extras = [] + board_bootconfig_extras = [] + + for variant in la_variants: + if variant == "consolidate": + mod_list = _niobe_consolidate_in_tree_modules + else: + mod_list = _niobe_in_tree_modules + board_kernel_cmdline_extras += ["nosoftlockup"] + kernel_vendor_cmdline_extras += ["nosoftlockup"] + board_bootconfig_extras += ["androidboot.console=0"] + + define_msm_la( + msm_target = target_name, + variant = variant, + in_tree_module_list = mod_list, + boot_image_opts = boot_image_opts( + earlycon_addr = "qcom_geni,0x00a9C000", + kernel_vendor_cmdline_extras = kernel_vendor_cmdline_extras, + board_kernel_cmdline_extras = board_kernel_cmdline_extras, + board_bootconfig_extras = board_bootconfig_extras, + ), + ) diff --git a/target_variants.bzl b/target_variants.bzl index b313b4d60977..74296c51f0eb 100644 --- a/target_variants.bzl +++ b/target_variants.bzl @@ -3,6 +3,7 @@ la_targets = [ "autogvm", "blair", "gen3auto", + "niobe", "pineapple", "pitti", "sdmsteppeauto",