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

Revert "ANDROID: Convert db845c to a mixed build."

Browse Source 
Revert submission 2188970-db845c_mixed_build

Reason for revert: It breaks android-mainline
Reverted Changes:
I6cfb1ef19:ANDROID: Convert db845c to a mixed build.
I6680cb8ef:kleaf: Convert db845c to a mixed build.
I6cfb1ef19:ANDROID: Convert db845c to a mixed build.

Signed-off-by: Ulises Mendez Martinez <umendez@google.com>
Change-Id: I337800cc4483877587f0a25d1fde2dadc444a81e
This commit is contained in:
Ulises Mendez Martinez 2022-08-23 23:22:40 +00:00
parent 5caceeff5b
commit ea97a30864
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
BUILD.bazel
View File

@ -17,6 +17,7 @@ package(
],
)
load("//build/kernel/kleaf:constants.bzl", "aarch64_gz_outs")
load("//build/kernel/kleaf:common_kernels.bzl", "define_common_kernels", "define_db845c")
define_common_kernels(target_configs = {
@ -37,7 +38,7 @@ define_common_kernels(target_configs = {
# Sync with build.config.db845c
define_db845c(
name = "db845c",
outs = [
outs = aarch64_gz_outs + [
"arch/arm64/boot/dts/qcom/qrb5165-rb5.dtb",
"arch/arm64/boot/dts/qcom/sdm845-db845c.dtb",
"arch/arm64/boot/dts/qcom/sm8450-qrd.dtb",
@ -48,6 +49,8 @@ define_db845c(
"drivers/base/regmap/regmap-sdw.ko",
"drivers/base/regmap/regmap-slimbus.ko",
"drivers/base/regmap/regmap-spmi.ko",
# TODO(b/233404531): Remove zram.ko when db845c is a mixed build
"drivers/block/zram/zram.ko",
"drivers/bus/mhi/host/mhi.ko",
"drivers/clk/qcom/clk-qcom.ko",
"drivers/clk/qcom/clk-rpmh.ko",
@ -192,6 +195,8 @@ define_db845c(
"drivers/usb/typec/qcom-pmic-typec.ko",
"drivers/watchdog/pm8916_wdt.ko",
"drivers/watchdog/qcom-wdt.ko",
# TODO(b/233404531): Remove zsmalloc.ko when db845c is a mixed build
"mm/zsmalloc.ko",
"net/qrtr/qrtr.ko",
"net/qrtr/qrtr-mhi.ko",
"net/qrtr/qrtr-smd.ko",

1
arch/arm64/configs/db845c_gki.fragment
View File

@ -1,4 +1,3 @@
# CONFIG_MODULE_SIG_ALL is not set
CONFIG_QRTR=m
CONFIG_QRTR_TUN=m
CONFIG_SCSI_UFS_QCOM=m

7
build.config.db845c
View File

@ -7,14 +7,15 @@ FRAGMENT_CONFIG=${KERNEL_DIR}/arch/arm64/configs/db845c_gki.fragment
PRE_DEFCONFIG_CMDS="KCONFIG_CONFIG=${ROOT_DIR}/${KERNEL_DIR}/arch/arm64/configs/${DEFCONFIG} ${ROOT_DIR}/${KERNEL_DIR}/scripts/kconfig/merge_config.sh -m -r ${ROOT_DIR}/${KERNEL_DIR}/arch/arm64/configs/gki_defconfig ${ROOT_DIR}/${FRAGMENT_CONFIG}"
POST_DEFCONFIG_CMDS="rm ${ROOT_DIR}/${KERNEL_DIR}/arch/arm64/configs/${DEFCONFIG}"
MAKE_GOALS="
modules
MAKE_GOALS="${MAKE_GOALS}
qcom/sdm845-db845c.dtb
qcom/qrb5165-rb5.dtb
qcom/sm8450-qrd.dtb
Image.gz
"
FILES="
FILES="${FILES}
arch/arm64/boot/Image.gz
arch/arm64/boot/dts/qcom/sdm845-db845c.dtb
arch/arm64/boot/dts/qcom/qrb5165-rb5.dtb
arch/arm64/boot/dts/qcom/sm8450-qrd.dtb