From 68df4d0545669f2f94449ebe61d34fc1bb85b453 Mon Sep 17 00:00:00 2001
From: Alistair Delva <adelva@google.com>
Date: Mon, 8 Aug 2022 10:49:17 -0700
Subject: [PATCH] ANDROID: GKI: Add ARM64_16K_PAGES variant

Bug: 234045848
Signed-off-by: Alistair Delva <adelva@google.com>
Change-Id: I84fd4e666ca218cea7569132382cb133d9761047
---
 arch/arm64/configs/16k_gki.fragment | 3 +++
 build.config.gki.aarch64.16k        | 5 +++++
 2 files changed, 8 insertions(+)
 create mode 100644 arch/arm64/configs/16k_gki.fragment
 create mode 100644 build.config.gki.aarch64.16k

diff --git a/arch/arm64/configs/16k_gki.fragment b/arch/arm64/configs/16k_gki.fragment
new file mode 100644
index 000000000000..b923493edf18
--- /dev/null
+++ b/arch/arm64/configs/16k_gki.fragment
@@ -0,0 +1,3 @@
+CONFIG_ARM64_16K_PAGES=y
+# b/241785095
+# CONFIG_INCREMENTAL_FS is not set
diff --git a/build.config.gki.aarch64.16k b/build.config.gki.aarch64.16k
new file mode 100644
index 000000000000..feda2c7b20fc
--- /dev/null
+++ b/build.config.gki.aarch64.16k
@@ -0,0 +1,5 @@
+. ${ROOT_DIR}/${KERNEL_DIR}/build.config.gki.aarch64
+
+DEFCONFIG=16k_gki_defconfig
+PRE_DEFCONFIG_CMDS="cat ${ROOT_DIR}/${KERNEL_DIR}/arch/arm64/configs/gki_defconfig ${ROOT_DIR}/${KERNEL_DIR}/arch/arm64/configs/16k_gki.fragment > ${ROOT_DIR}/${KERNEL_DIR}/arch/arm64/configs/${DEFCONFIG};"
+POST_DEFCONFIG_CMDS="rm ${ROOT_DIR}/${KERNEL_DIR}/arch/arm64/configs/${DEFCONFIG}"