diff --git a/manage-config b/manage-config index 1d26574e1380..b5de5c99aa86 100755 --- a/manage-config +++ b/manage-config @@ -61,7 +61,8 @@ function get_section_opts(){ ret=0 exclusion_file="../patch/kconfig-exclusions" inclusion_file="../patch/kconfig-inclusions" -if [ -e ${exclusion_file} -o -e ${inclusion_file} ]; then +force_inclusion_file="../patch/kconfig-force-inclusions" +if [ -e ${exclusion_file} -o -e ${inclusion_file} -o -e ${force_inclusion_file} ]; then # Process any exclusions in the kernel if [ -f ${exclusion_file} ]; then @@ -124,6 +125,16 @@ if [ -e ${exclusion_file} -o -e ${inclusion_file} ]; then fi fi + # Process any force inclusions in the kernel + if [ -f ${force_inclusion_file} ]; then + force_inclusion_opts=$(get_section_opts ${force_inclusion_file} "common" ${ARCH} ${PLATFORM}) + while read -r opt; do + if [ ! -z "$opt" ] && [[ ! "$opt" =~ ^#.* ]]; then + echo $opt >> ${CONFIG_FILE} + fi + done <<< ${force_inclusion_opts}; + fi + echo fi diff --git a/patch/kconfig-force-inclusions b/patch/kconfig-force-inclusions new file mode 100644 index 000000000000..e148766378b2 --- /dev/null +++ b/patch/kconfig-force-inclusions @@ -0,0 +1,3 @@ +[arm64] +CONFIG_COMPAT_VDSO=y +CONFIG_THUMB2_COMPAT_VDSO=y