diff --git a/arch/arm64/configs/vendor/lahaina_QGKI.config b/arch/arm64/configs/vendor/lahaina_QGKI.config
index 1e750f6a89f5..8df1a05cbd86 100644
--- a/arch/arm64/configs/vendor/lahaina_QGKI.config
+++ b/arch/arm64/configs/vendor/lahaina_QGKI.config
@@ -30,6 +30,14 @@ CONFIG_MSM_GLOBAL_SYNX=y
 CONFIG_MSM_CVP=y
 CONFIG_IIO=y
 CONFIG_ION_POOL_AUTO_REFILL=y
+CONFIG_HOTPLUG_SIZE_BITS=29
+CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE=y
+CONFIG_MEMORY_HOTPLUG_MOVABLE_NODE=y
+CONFIG_MEMORY_HOTREMOVE=y
+CONFIG_QCOM_MEM_OFFLINE=y
+CONFIG_OVERRIDE_MEMORY_LIMIT=y
+# CONFIG_ZONE_DEVICE is not set
+# CONFIG_BUG_ON_HW_MEM_ONLINE_FAIL is not set
 CONFIG_MSM_BT_POWER=m
 CONFIG_MEDIA_RADIO_SUPPORT=y
 CONFIG_I2C_RTC6226_QCA=m
diff --git a/arch/arm64/configs/vendor/lahaina_debug.config b/arch/arm64/configs/vendor/lahaina_debug.config
index d39ba11a54e7..df891ef523e5 100644
--- a/arch/arm64/configs/vendor/lahaina_debug.config
+++ b/arch/arm64/configs/vendor/lahaina_debug.config
@@ -7,6 +7,7 @@ CONFIG_ATOMIC64_SELFTEST=m
 CONFIG_TEST_USER_COPY=m
 CONFIG_PAGE_POISONING_ENABLE_DEFAULT=y
 CONFIG_OF_RESERVED_MEM_CHECK=y
+CONFIG_BUG_ON_HW_MEM_ONLINE_FAIL=y
 CONFIG_SERIAL_MSM_GENI=y
 CONFIG_SERIAL_MSM_GENI_CONSOLE=y
 CONFIG_MSM_GENI_SE=y