moonjuice/kernel_arpi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ANDROID: Convert db845c to a mixed build.

Browse Source 
* This means using GKI[0] artifacts as base for the kernel.

[0] https://source.android.com/docs/core/architecture/kernel/generic-kernel-image#fragmentation-fix-gki

Bug: 233404531
Signed-off-by: Ulises Mendez Martinez <umendez@google.com>
Change-Id: I6cfb1ef1904e4b8d2755552ea139f150ce09db90
This commit is contained in:
Ulises Mendez Martinez
2022-08-17 19:11:48 +00:00
parent 2d0f4a18b1
commit 09bdad5187
3 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
BUILD.bazel
View File

@@ -17,7 +17,6 @@ package(
], ],
) )
load("//build/kernel/kleaf:constants.bzl", "aarch64_gz_outs")
load("//build/kernel/kleaf:common_kernels.bzl", "define_common_kernels", "define_db845c") load("//build/kernel/kleaf:common_kernels.bzl", "define_common_kernels", "define_db845c")
# This uses android/abi_gki_aarch64* in kmi_configs. If the list of # This uses android/abi_gki_aarch64* in kmi_configs. If the list of
@@ -48,7 +47,7 @@ define_common_kernels(target_configs = {
# Sync with build.config.db845c # Sync with build.config.db845c
define_db845c( define_db845c(
name = "db845c", name = "db845c",
outs = aarch64_gz_outs + [ outs = [
"arch/arm64/boot/dts/qcom/qrb5165-rb5.dtb", "arch/arm64/boot/dts/qcom/qrb5165-rb5.dtb",
"arch/arm64/boot/dts/qcom/sdm845-db845c.dtb", "arch/arm64/boot/dts/qcom/sdm845-db845c.dtb",
], ],
@@ -58,8 +57,6 @@ define_db845c(
"drivers/base/regmap/regmap-sdw.ko", "drivers/base/regmap/regmap-sdw.ko",
"drivers/base/regmap/regmap-slimbus.ko", "drivers/base/regmap/regmap-slimbus.ko",
"drivers/base/regmap/regmap-spmi.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/core/mhi.ko", "drivers/bus/mhi/core/mhi.ko",
"drivers/clk/qcom/clk-qcom.ko", "drivers/clk/qcom/clk-qcom.ko",
"drivers/clk/qcom/clk-rpmh.ko", "drivers/clk/qcom/clk-rpmh.ko",
@@ -189,8 +186,6 @@ define_db845c(
"drivers/usb/typec/qcom-pmic-typec.ko", "drivers/usb/typec/qcom-pmic-typec.ko",
"drivers/watchdog/pm8916_wdt.ko", "drivers/watchdog/pm8916_wdt.ko",
"drivers/watchdog/qcom-wdt.ko", "drivers/watchdog/qcom-wdt.ko",
# TODO(b/233404531): Remove zsmalloc.ko when db845c is a mixed build
"mm/zsmalloc.ko",
"net/mac80211/mac80211.ko", "net/mac80211/mac80211.ko",
"net/qrtr/ns.ko", "net/qrtr/ns.ko",
"net/qrtr/qrtr.ko", "net/qrtr/qrtr.ko",

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

@@ -1,3 +1,4 @@
# CONFIG_MODULE_SIG_ALL is not set
CONFIG_CFG80211=m CONFIG_CFG80211=m
CONFIG_NL80211_TESTMODE=y CONFIG_NL80211_TESTMODE=y
# CONFIG_CFG80211_DEFAULT_PS is not set # CONFIG_CFG80211_DEFAULT_PS is not set

7
build.config.db845c
View File

@@ -7,14 +7,13 @@ 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}" 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}" POST_DEFCONFIG_CMDS="rm ${ROOT_DIR}/${KERNEL_DIR}/arch/arm64/configs/${DEFCONFIG}"
MAKE_GOALS="${MAKE_GOALS} MAKE_GOALS="
modules
qcom/sdm845-db845c.dtb qcom/sdm845-db845c.dtb
qcom/qrb5165-rb5.dtb qcom/qrb5165-rb5.dtb
Image.gz
" "
FILES="${FILES} FILES="
arch/arm64/boot/Image.gz
arch/arm64/boot/dts/qcom/sdm845-db845c.dtb arch/arm64/boot/dts/qcom/sdm845-db845c.dtb
arch/arm64/boot/dts/qcom/qrb5165-rb5.dtb arch/arm64/boot/dts/qcom/qrb5165-rb5.dtb
" "