Snap for 9583696 from 14205ef36b to android14-6.1-keystone-qcom-release
Change-Id: I48615f3599fac53ffa229a10858cabd9e218db1e
This commit is contained in:
Android Build Coastguard Worker
commit
9a6451e592
@ -245,6 +245,10 @@ define_db845c(
|
||||
],
|
||||
)
|
||||
|
||||
load(":consolidate.bzl", "define_consolidate")
|
||||
|
||||
define_consolidate()
|
||||
|
||||
# TODO(b/258259749): Convert rockpi4 to mixed build
|
||||
kernel_build(
|
||||
name = "rockpi4",
|
||||
|
||||
78
arch/arm64/configs/consolidate.fragment
Normal file
78
arch/arm64/configs/consolidate.fragment
Normal file
@ -0,0 +1,78 @@
|
||||
# CONFIG_ATOMIC64_SELFTEST is not set
|
||||
# CONFIG_BACKTRACE_SELF_TEST is not set
|
||||
# CONFIG_BITFIELD_KUNIT is not set
|
||||
# CONFIG_BITS_TEST is not set
|
||||
CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC=y
|
||||
CONFIG_CMDLINE="console=ttyMSM0,115200n8 kasan.stacktrace=off stack_depot_disable=off page_owner=on no_hash_pointers panic_on_taint=0x20"
|
||||
CONFIG_DEBUG_KMEMLEAK=y
|
||||
# CONFIG_DEBUG_KMEMLEAK_AUTO_SCAN is not set
|
||||
CONFIG_DEBUG_KMEMLEAK_DEFAULT_OFF=y
|
||||
CONFIG_DEBUG_KMEMLEAK_MEM_POOL_SIZE=16000
|
||||
# CONFIG_DEBUG_KMEMLEAK_TEST is not set
|
||||
# CONFIG_DEBUG_KOBJECT_RELEASE is not set
|
||||
CONFIG_DEBUG_MUTEXES=y
|
||||
CONFIG_DEBUG_OBJECTS=y
|
||||
CONFIG_DEBUG_OBJECTS_ENABLE_DEFAULT=1
|
||||
CONFIG_DEBUG_OBJECTS_FREE=y
|
||||
# CONFIG_DEBUG_OBJECTS_PERCPU_COUNTER is not set
|
||||
# CONFIG_DEBUG_OBJECTS_RCU_HEAD is not set
|
||||
# CONFIG_DEBUG_OBJECTS_SELFTEST is not set
|
||||
CONFIG_DEBUG_OBJECTS_TIMERS=y
|
||||
CONFIG_DEBUG_OBJECTS_WORK=y
|
||||
CONFIG_DEBUG_PREEMPT=y
|
||||
CONFIG_DEBUG_RWSEMS=y
|
||||
CONFIG_DEBUG_SPINLOCK=y
|
||||
# CONFIG_DPM_WATCHDOG is not set
|
||||
CONFIG_DYNAMIC_DEBUG=y
|
||||
# CONFIG_FIND_BIT_BENCHMARK is not set
|
||||
CONFIG_GKI_HACKS_FOR_DEBUG_CONFIG=y
|
||||
CONFIG_I2C_CHARDEV=y
|
||||
# CONFIG_INTERVAL_TREE_TEST is not set
|
||||
# CONFIG_KPROBES_SANITY_TEST is not set
|
||||
# CONFIG_LINEAR_RANGES_TEST is not set
|
||||
# CONFIG_LIST_KUNIT_TEST is not set
|
||||
# CONFIG_LKDTM is not set
|
||||
CONFIG_LOCALVERSION="-mainline-qki-consolidate"
|
||||
CONFIG_LOCKUP_DETECTOR=y
|
||||
# CONFIG_PERCPU_TEST is not set
|
||||
CONFIG_PID_IN_CONTEXTIDR=y
|
||||
# CONFIG_PM_ADVANCED_DEBUG is not set
|
||||
CONFIG_PM_DEBUG=y
|
||||
CONFIG_PM_SLEEP_DEBUG=y
|
||||
# CONFIG_PM_TEST_SUSPEND is not set
|
||||
CONFIG_PREEMPTIRQ_TRACEPOINTS=y
|
||||
# CONFIG_RBTREE_TEST is not set
|
||||
# CONFIG_REED_SOLOMON_TEST is not set
|
||||
CONFIG_RUNTIME_TESTING_MENU=y
|
||||
CONFIG_SOFTLOCKUP_DETECTOR=y
|
||||
CONFIG_SPI_SPIDEV=y
|
||||
# CONFIG_SYSCTL_KUNIT_TEST is not set
|
||||
CONFIG_TASKS_RUDE_RCU=y
|
||||
# CONFIG_TEST_BITMAP is not set
|
||||
# CONFIG_TEST_BITOPS is not set
|
||||
# CONFIG_TEST_BLACKHOLE_DEV is not set
|
||||
# CONFIG_TEST_BPF is not set
|
||||
# CONFIG_TEST_FIRMWARE is not set
|
||||
# CONFIG_TEST_FREE_PAGES is not set
|
||||
# CONFIG_TEST_HEXDUMP is not set
|
||||
# CONFIG_TEST_IDA is not set
|
||||
# CONFIG_TEST_KMOD is not set
|
||||
# CONFIG_TEST_KSTRTOX is not set
|
||||
# CONFIG_TEST_LIST_SORT is not set
|
||||
# CONFIG_TEST_LKM is not set
|
||||
# CONFIG_TEST_MEMCAT_P is not set
|
||||
# CONFIG_TEST_MEMINIT is not set
|
||||
# CONFIG_TEST_MIN_HEAP is not set
|
||||
# CONFIG_TEST_PRINTF is not set
|
||||
# CONFIG_TEST_RHASHTABLE is not set
|
||||
# CONFIG_TEST_SORT is not set
|
||||
# CONFIG_TEST_STATIC_KEYS is not set
|
||||
# CONFIG_TEST_STRING_HELPERS is not set
|
||||
# CONFIG_TEST_STRSCPY is not set
|
||||
# CONFIG_TEST_SYSCTL is not set
|
||||
# CONFIG_TEST_UDELAY is not set
|
||||
# CONFIG_TEST_USER_COPY is not set
|
||||
# CONFIG_TEST_UUID is not set
|
||||
# CONFIG_TEST_VMALLOC is not set
|
||||
# CONFIG_TEST_XARRAY is not set
|
||||
CONFIG_TRACE_PREEMPT_TOGGLE=y
|
||||
5
build.config.gki_consolidate.aarch64
Normal file
5
build.config.gki_consolidate.aarch64
Normal file
@ -0,0 +1,5 @@
|
||||
KERNEL_DIR=common
|
||||
DEFCONFIG=consolidate_defconfig
|
||||
FRAGMENT_CONFIG=${KERNEL_DIR}/arch/arm64/configs/consolidate.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}"
|
||||
60
consolidate.bzl
Normal file
60
consolidate.bzl
Normal file
@ -0,0 +1,60 @@
|
||||
load(
|
||||
"//build/kernel/kleaf:kernel.bzl",
|
||||
"kernel_build",
|
||||
"kernel_build_config",
|
||||
"kernel_images",
|
||||
"kernel_modules_install",
|
||||
)
|
||||
load("//build/kernel/kleaf:constants.bzl", "aarch64_outs")
|
||||
load(":modules.bzl", "COMMON_GKI_MODULES_LIST")
|
||||
|
||||
rule_base = "kernel_aarch64_consolidate"
|
||||
|
||||
def _gen_config_without_source_lines(build_config, target):
|
||||
rule_name = "{}.{}".format(target, build_config)
|
||||
out_file_name = rule_name + ".generated"
|
||||
native.genrule(
|
||||
name = rule_name,
|
||||
srcs = [build_config],
|
||||
outs = [out_file_name],
|
||||
cmd_bash = "sed -e '/^\\. /d' $(location {}) > $@".format(build_config),
|
||||
)
|
||||
|
||||
return ":" + rule_name
|
||||
|
||||
def define_consolidate():
|
||||
kernel_build_config(
|
||||
name = rule_base + "_build_config",
|
||||
srcs = [
|
||||
# do not sort
|
||||
"build.config.constants",
|
||||
_gen_config_without_source_lines("build.config.common", rule_base),
|
||||
"build.config.aarch64",
|
||||
"build.config.gki_consolidate.aarch64",
|
||||
_gen_config_without_source_lines("build.config.gki.aarch64", rule_base),
|
||||
],
|
||||
)
|
||||
|
||||
kernel_build(
|
||||
name = rule_base,
|
||||
outs = aarch64_outs,
|
||||
implicit_outs = [
|
||||
"scripts/sign-file",
|
||||
"certs/signing_key.pem",
|
||||
"certs/signing_key.x509",
|
||||
],
|
||||
module_implicit_outs = COMMON_GKI_MODULES_LIST,
|
||||
build_config = rule_base + "_build_config",
|
||||
)
|
||||
|
||||
kernel_modules_install(
|
||||
name = "{}_modules_install".format(rule_base),
|
||||
kernel_build = ":{}".format(rule_base),
|
||||
)
|
||||
|
||||
kernel_images(
|
||||
name = "{}_images".format(rule_base),
|
||||
kernel_build = ":{}".format(rule_base),
|
||||
build_system_dlkm = True,
|
||||
kernel_modules_install = ":{}_modules_install".format(rule_base),
|
||||
)
|
||||
@ -2023,3 +2023,4 @@ config ARCH_HAS_SYSCALL_WRAPPER
|
||||
def_bool n
|
||||
|
||||
source "init/Kconfig.gki"
|
||||
source "init/Kconfig.gki-debug"
|
||||
|
||||
9
init/Kconfig.gki-debug
Normal file
9
init/Kconfig.gki-debug
Normal file
@ -0,0 +1,9 @@
|
||||
config GKI_HIDDEN_RCUTORTURE
|
||||
bool
|
||||
select TASKS_RUDE_RCU
|
||||
|
||||
config GKI_HACKS_FOR_DEBUG_CONFIG
|
||||
bool "GKI Dummy config options for debug configurations"
|
||||
select TRACE_PREEMPT_TOGGLE
|
||||
select TRACE_IRQFLAGS
|
||||
select GKI_HIDDEN_RCUTORTURE
|
||||
@ -485,7 +485,8 @@ EXPORT_SYMBOL_GPL(do_trace_rcu_torture_read);
|
||||
do { } while (0)
|
||||
#endif
|
||||
|
||||
#if IS_ENABLED(CONFIG_RCU_TORTURE_TEST) || IS_MODULE(CONFIG_RCU_TORTURE_TEST)
|
||||
#if IS_ENABLED(CONFIG_RCU_TORTURE_TEST) || IS_MODULE(CONFIG_RCU_TORTURE_TEST) \
|
||||
|| IS_ENABLED(CONFIG_GKI_HIDDEN_RCUTORTURE)
|
||||
/* Get rcutorture access to sched_setaffinity(). */
|
||||
long rcutorture_sched_setaffinity(pid_t pid, const struct cpumask *in_mask)
|
||||
{
|
||||
|
||||
Loading…
Reference in New Issue
Block a user