diff options
| -rw-r--r-- | BUILD.bazel | 9 | ||||
| -rw-r--r-- | aarch64_16k.fragment | 5 | ||||
| -rw-r--r-- | build.config.virtual_device.aarch64.16k | 18 |
3 files changed, 13 insertions, 19 deletions
diff --git a/BUILD.bazel b/BUILD.bazel index cd9ddc6..57de721 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -591,12 +591,19 @@ kernel_build( "arch/arm64/boot/dts/arm/fvp-base-revc.dtb", ], base_kernel = "//common:kernel_aarch64_16k", - build_config = "build.config.virtual_device.aarch64.16k", + build_config = "build.config.virtual_device.aarch64", + defconfig_fragments = [ + "virtual_device_core.fragment", + "virtual_device.fragment", + "aarch64.fragment", + "aarch64_16k.fragment", + ], make_goals = [ "modules", "arm/fvp-base-revc.dtb", ], module_outs = _VIRT_COMMON_MODULES + _VIRT_AARCH64_MODULES, + page_size = "16k", strip_modules = True, ) diff --git a/aarch64_16k.fragment b/aarch64_16k.fragment new file mode 100644 index 0000000..4fca28b --- /dev/null +++ b/aarch64_16k.fragment @@ -0,0 +1,5 @@ +# b/345544754: This is explicitly set because +# CONFIG_ARM64_16K_PAGES is applied after `make defconfig`, +# causing it to take an old value of ARCH_MMAP_RND_COMPAT_BITS_MIN as +# the default. +CONFIG_ARCH_MMAP_RND_COMPAT_BITS=9 diff --git a/build.config.virtual_device.aarch64.16k b/build.config.virtual_device.aarch64.16k deleted file mode 100644 index 1f5d2d7..0000000 --- a/build.config.virtual_device.aarch64.16k +++ /dev/null @@ -1,18 +0,0 @@ -. ${ROOT_DIR}/common-modules/virtual-device/build.config.virtual_device.aarch64 - -DEFCONFIG=vd_aarch_64_16k_gki_defconfig - -# HACK: bug in bash 5.2 that if the last command of the eval in a subshell is not a built-in -# command, the subshell exits prematurely. This is fixed in 5.2.15 but we leave -# this hack in until bash becomes hermetic (unlikely). -# See b/275468906#comment8 -PRE_DEFCONFIG_CMDS="mkdir -p \${OUT_DIR}/arch/arm64/configs && \ - KCONFIG_CONFIG=\${OUT_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}/${KERNEL_DIR}/arch/arm64/configs/16k_gki.fragment \ - ${ROOT_DIR}/common-modules/virtual-device/virtual_device_core.fragment \ - ${ROOT_DIR}/common-modules/virtual-device/virtual_device.fragment \ - ${ROOT_DIR}/common-modules/virtual-device/aarch64.fragment && \ - true" -POST_DEFCONFIG_CMDS="" |