android/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build.config: Enable consolidate GKI compilation on Waipio

Browse Source 
Enable compilation of consolidate defconfig fragment for waipio.

Change-Id: Id27ebe6db3e2a968205bf4f008228f279ab830d9
Signed-off-by: Elliot Berman <eberman@codeaurora.org>
This commit is contained in:
Elliot Berman 2020-08-14 14:12:45 -07:00
parent 4c7cb19e89
commit 83cafa5b00
2 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
build.config.msm.gki
View File

@ -13,15 +13,21 @@ fi
ABI_DEFINITION=abi_gki_aarch64.xml
KMI_WHITELIST=abi_gki_qcom_whitelist
case "${VARIANT}" in
gki)
apply_defconfig_fragment ${KERNEL_DIR}/arch/${ARCH}/configs/vendor/${MSM_ARCH}_GKI.config vendor/${MSM_ARCH}-gki_defconfig
;;
gki-ack)
# In gki-only, then using ACK's GKI config directly
. ${KERNEL_DIR}/build.config.gki
;;
*)
echo "Unsupported variant '${VARIANT}'"
;;
esac
function build_defconfig_fragments() {
if [[ "${VARIANT}" =~ ^(gki|consolidate)$ ]]; then
apply_defconfig_fragment ${KERNEL_DIR}/arch/${ARCH}/configs/vendor/${MSM_ARCH}_GKI.config vendor/${MSM_ARCH}-gki_defconfig
if [ "${VARIANT}" = gki ]; then
return
fi
# ABI comparison isn't applicable on consolidate variant
unset ABI_DEFINITION
apply_defconfig_fragment ${KERNEL_DIR}/arch/${ARCH}/configs/vendor/${MSM_ARCH}_consolidate.config vendor/${MSM_ARCH}-consolidate_defconfig
elif [ "${VARIANT}" = gki-ack ]; then
# In gki-only, then using ACK's GKI config directly
. ${KERNEL_DIR}/build.config.gki
else
echo "Variant '${VARIANT}' unsupported by gki"
exit 1
fi
}
build_defconfig_fragments

4
build.config.msm.waipio
View File

@ -6,8 +6,8 @@
################################################################################
## Variant setup
MSM_ARCH=waipio
VARIANTS=(gki)
[ -z "${VARIANT}" ] && VARIANT=gki
VARIANTS=(consolidate gki)
[ -z "${VARIANT}" ] && VARIANT=consolidate
BOOT_IMAGE_HEADER_VERSION=2
BASE_ADDRESS=0x80000000