diff --git a/Makefile b/Makefile
index 7381d225..4947798f 100644
--- a/Makefile
+++ b/Makefile
@@ -9,6 +9,14 @@ ifeq ($(CONFIG_TEGRA_VIRTUALIZATION),y)
 subdir-ccflags-y += -DCONFIG_TEGRA_VIRTUALIZATION
 endif
 
+ifeq ($(CONFIG_TEGRA_SYSTEM_TYPE_ACK),y)
+subdir-ccflags-y += -DNV_BUILD_KERNEL_ACK
+subdir-ccflags-y += -Wno-sometimes-uninitialized
+subdir-ccflags-y += -Wno-parentheses-equality
+subdir-ccflags-y += -Wno-enum-conversion
+subdir-ccflags-y += -Wno-implicit-fallthrough
+endif
+
 obj-m += drivers/
 
 ifdef CONFIG_SOUND
diff --git a/drivers/crypto/Makefile b/drivers/crypto/Makefile
index e0fef057..fbe46cd8 100644
--- a/drivers/crypto/Makefile
+++ b/drivers/crypto/Makefile
@@ -8,6 +8,8 @@ endif
 obj-m += tegra-se-nvrng.o
 
 ifdef CONFIG_TEGRA_HOST1X
+ifneq ($(CONFIG_TEGRA_SYSTEM_TYPE_ACK),y)
 ccflags-y += -Wframe-larger-than=2560
+endif
 obj-m += tegra-nvvse-cryptodev.o
 endif