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

build.config: Consolidate duplicated settings

Browse Source 
Consolidate BRANCH, CONFIG_TARGET settings into build.config.msm.common
and consolidate the VARIANT -> defconfig mapping for Lahaina and Waipio
into build.config.msm.gki. This simplifies the target-specific
build.config files and improves code re-use.

Change-Id: I92a246e28f1034b74f44b4293bad671411e62a1e
Signed-off-by: Elliot Berman <eberman@codeaurora.org>
This commit is contained in:
Elliot Berman 2020-07-23 13:16:33 -07:00
parent 655afa578d
commit 37981e55d6
4 changed files with 28 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
build.config.msm.common
View File

@ -1,6 +1,9 @@
CONFIG_DIR=arch/${ARCH}/configs
CC="${ROOT_DIR}/common/scripts/gcc-wrapper.py ${CC}"
BRANCH=msm-waipio
CONFIG_TARGET=msm.${MSM_ARCH}
################################################################################
## DTB general support
DTB_DIR=vendor/qcom
@ -39,6 +42,11 @@ if [ ! -z $VARIANT ]; then
BRANCH+=-${VARIANT}
fi
if ( for v in "${VARIANTS[@]}"; do if [ "${v}" = "${VARIANT}" ]; then exit 1; fi; done; exit 0 ) ; then
echo "Unsupported variant '${VARIANT}'"
exit 1
fi
################################################################################
## defconfigs

16
build.config.msm.gki
View File

@ -9,3 +9,19 @@ fi
if [ "${BOOT_IMAGE_HEADER_VERSION}" -lt "3" ]; then
VENDOR_RAMDISK_BINARY="${GKI_RAMDISK_PREBUILT_BINARY} ${VENDOR_RAMDISK_BINARY}"
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

25
build.config.msm.lahaina
View File

@ -1,8 +1,3 @@
################################################################################
## Defaulting required variables
[ -z "${VARIANT}" ] && VARIANT=default
[ -z "${CONFIG_TARGET}" ] && CONFIG_TARGET=msm.lahaina
################################################################################
## Inheriting configs from ACK
. ${ROOT_DIR}/common/build.config.common
@ -11,8 +6,8 @@
################################################################################
## Variant setup
MSM_ARCH=lahaina
BRANCH=msm-waipio
VARIANTS=(gki)
[ -z "${VARIANT}" ] && VARIANT=gki
DT_OVERLAY_SUPPORT=1
@ -20,23 +15,7 @@ BOOT_IMAGE_HEADER_VERSION=3
BASE_ADDRESS=0x80000000
PAGE_SIZE=4096
ABI_DEFINITION=abi_gki_aarch64.xml
KMI_WHITELIST=abi_gki_qcom_whitelist
################################################################################
## Inheriting MSM configs
. ${KERNEL_DIR}/build.config.msm.common
case "${VARIANT}" in
gki)
. ${KERNEL_DIR}/build.config.msm.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
. ${KERNEL_DIR}/build.config.msm.gki

25
build.config.msm.waipio
View File

@ -1,8 +1,3 @@
################################################################################
## Defaulting required variables
[ -z "${VARIANT}" ] && VARIANT=default
[ -z "${CONFIG_TARGET}" ] && CONFIG_TARGET=msm.waipio
################################################################################
## Inheriting configs from ACK
. ${ROOT_DIR}/common/build.config.common
@ -11,30 +6,14 @@
################################################################################
## Variant setup
MSM_ARCH=waipio
BRANCH=msm-waipio
VARIANTS=(gki)
[ -z "${VARIANT}" ] && VARIANT=gki
BOOT_IMAGE_HEADER_VERSION=2
BASE_ADDRESS=0x80000000
PAGE_SIZE=4096
ABI_DEFINITION=abi_gki_aarch64.xml
KMI_WHITELIST=abi_gki_qcom_whitelist
################################################################################
## Inheriting MSM configs
. ${KERNEL_DIR}/build.config.msm.common
case "${VARIANT}" in
gki)
. ${KERNEL_DIR}/build.config.msm.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
. ${KERNEL_DIR}/build.config.msm.gki