From 7a1743c35f6af4d5cac96450c83fca14c35af43d Mon Sep 17 00:00:00 2001
From: Elliot Berman <eberman@codeaurora.org>
Date: Mon, 19 Apr 2021 07:45:06 -0700
Subject: [PATCH] build.config.msm.*: Add transition support to msm_kernel
 folder

To help facilitate easy transition for kernel source to move from
kernel_platform/common to kernel_platform/msm-kernel, a symlink of
build.config.msm.{lahaina,waipio,waipio.tuivm} will be created in
kernel_platform/common folder for build processes which hard-code
"common/build.config.msm.{lahaina,waipio,waipio.tuivm}" as the
BUILD_CONFIG. When the symlink is used, KERNEL_DIR is set to common/,
but it should use msm-kernel as the real KERNEL_DIR, since that's where
msm-5.10 really lives.

This is especially the case since build.config.msm.common and other
build.config files that build.config.msm.{waipio,waipio.tuivm,lahaina}
use live in msm-5.10, not the kernel_platform/common folder.

Change-Id: Id95b46d345c726384ed741ed2cfa4ed7923288f0
Signed-off-by: Elliot Berman <eberman@codeaurora.org>
---
 build.config.msm.lahaina      | 4 ++++
 build.config.msm.waipio       | 4 ++++
 build.config.msm.waipio.tuivm | 4 ++++
 3 files changed, 12 insertions(+)

diff --git a/build.config.msm.lahaina b/build.config.msm.lahaina
index 2b9bee9ebf67..9c8d815ee7ec 100644
--- a/build.config.msm.lahaina
+++ b/build.config.msm.lahaina
@@ -9,6 +9,10 @@ MSM_ARCH=lahaina
 VARIANTS=(gki)
 [ -z "${VARIANT}" ] && VARIANT=gki
 
+if [ -e "${ROOT_DIR}/msm-kernel" -a "${KERNEL_DIR}" = "common" ]; then
+	KERNEL_DIR="msm-kernel"
+fi
+
 DT_OVERLAY_SUPPORT=1
 
 BOOT_IMAGE_HEADER_VERSION=3
diff --git a/build.config.msm.waipio b/build.config.msm.waipio
index eb2080383761..d1e9f5acbbef 100644
--- a/build.config.msm.waipio
+++ b/build.config.msm.waipio
@@ -9,6 +9,10 @@ MSM_ARCH=waipio
 VARIANTS=(consolidate gki)
 [ -z "${VARIANT}" ] && VARIANT=consolidate
 
+if [ -e "${ROOT_DIR}/msm-kernel" -a "${KERNEL_DIR}" = "common" ]; then
+	KERNEL_DIR="msm-kernel"
+fi
+
 BOOT_IMAGE_HEADER_VERSION=3
 BASE_ADDRESS=0x80000000
 PAGE_SIZE=4096
diff --git a/build.config.msm.waipio.tuivm b/build.config.msm.waipio.tuivm
index c280ad23e2ae..6f13ae082820 100644
--- a/build.config.msm.waipio.tuivm
+++ b/build.config.msm.waipio.tuivm
@@ -10,6 +10,10 @@ MSM_ARCH=waipio_tuivm
 VARIANTS=(defconfig debug_defconfig)
 [ -z "${VARIANT}" ] && VARIANT=debug_defconfig
 
+if [ -e "${ROOT_DIR}/msm-kernel" -a "${KERNEL_DIR}" = "common" ]; then
+	KERNEL_DIR="msm-kernel"
+fi
+
 BOOT_IMAGE_HEADER_VERSION=3
 BASE_ADDRESS=0x80000000
 PAGE_SIZE=4096