From f66b1a4c8da50d7ab57a961d816830bcb4a7c553 Mon Sep 17 00:00:00 2001 From: John Moon Date: Mon, 27 Feb 2023 18:11:52 -0800 Subject: [PATCH] ANDROID: build: Use new device tree functions We've updated the vendor device tree platform map to be exposed via macros instead of the raw map. Update our use of the raw map to use the macros instead. Change-Id: I5f49c42d0e39a7625342bab438f9892fe3993cf5 Signed-off-by: John Moon --- msm_kernel_extensions.bzl | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/msm_kernel_extensions.bzl b/msm_kernel_extensions.bzl index 8f97379e0556..da985ae58bc2 100644 --- a/msm_kernel_extensions.bzl +++ b/msm_kernel_extensions.bzl @@ -1,11 +1,5 @@ load("@bazel_skylib//rules:common_settings.bzl", "bool_flag") -load("//msm-kernel/arch/arm64/boot/dts/vendor:qcom/platform_map.bzl", "platform_map") - -def _get_dtb_platform(target): - if not target in platform_map: - fail("{} not in devicetree platform map!".format(target)) - - return platform_map[target] +load("//msm-kernel/arch/arm64/boot/dts/vendor:qcom/platform_map.bzl", _get_dtb_list = "get_dtb_list", _get_dtbo_list = "get_dtbo_list") def define_top_level_rules(): for skippable in ["abl", "dtc", "test_mapping", "abi"]: @@ -28,10 +22,10 @@ def get_build_config_fragments(target): return [] def get_dtb_list(target): - return _get_dtb_platform(target)["dtb_list"] + return _get_dtb_list(target) def get_dtbo_list(target): - return _get_dtb_platform(target)["dtbo_list"] + return _get_dtbo_list(target) def get_dtstree(target): return "//msm-kernel/arch/arm64/boot/dts/vendor:msm_dt"