diff --git a/Makefile b/Makefile
index 5b3a50394f5a4aafffbee205095d0df028073851..3a557e324d5e9f700206a2da3d574b2ff0347264 100644
--- a/Makefile
+++ b/Makefile
@@ -61,7 +61,9 @@ EXTRA_CFLAGS += -DMAILBOX_POOL_COUNT=32 -DLATE_KILL_WHEN_TA_LOAD
 ifeq ($(CROSS_DOMAIN_PERF), y)
 EXTRA_CFLAGS += -DCROSS_DOMAIN_PERF
 endif
+ifeq ($(CPU_GROUP_BINDING), y)
 EXTRA_CFLAGS += -DCONFIG_CPU_GROUP_BINDING -DCONFIG_NUM_DIE=4 -DCONFIG_NUM_PHY_CORE_PER_DIE=40 -DCONFIG_NUM_TEE_PHY_CORE_PER_DIE=32 -DCONFIG_MAX_TEE_CORE=128
+endif
 
 all:
 	make -C $(KDIR) M=$(PWD) modules