diff --git a/arch/xtensa/src/common/espressif/Make.defs b/arch/xtensa/src/common/espressif/Make.defs
index 9c70fa621a4..1b1a63efc7a 100644
--- a/arch/xtensa/src/common/espressif/Make.defs
+++ b/arch/xtensa/src/common/espressif/Make.defs
@@ -98,7 +98,7 @@ CHIP_CSRCS += esp_crypto.c
 endif
 endif
 
-ifeq ($(CONFIG_ESPRESSIF_USE_ULP_RISCV_CORE), y)
+ifeq ($(CONFIG_ESPRESSIF_USE_ULP_RISCV_CORE),y)
 CHIP_CSRCS += esp_ulp.c
 endif
 
@@ -114,7 +114,7 @@ CHIP_CSRCS += esp_wifi_event_handler.c
 CHIP_CSRCS += esp_wlan_netdev.c
 CHIP_CSRCS += esp_wifi_api.c
 endif
-ifeq ($(CONFIG_ESPRESSIF_ESPNOW_PKTRADIO), y)
+ifeq ($(CONFIG_ESPRESSIF_ESPNOW_PKTRADIO),y)
 CHIP_CSRCS += esp_espnow_pktradio.c
 EXTRA_LIBS += -lespnow
 endif
diff --git a/arch/xtensa/src/lx6/Toolchain.defs b/arch/xtensa/src/lx6/Toolchain.defs
index f986019d2a7..c00c80633dd 100644
--- a/arch/xtensa/src/lx6/Toolchain.defs
+++ b/arch/xtensa/src/lx6/Toolchain.defs
@@ -31,15 +31,15 @@
 #                   reliable code generation.
 #
 
-ifeq ($(CONFIG_XTENSA_TOOLCHAIN_XCC), y)
+ifeq ($(CONFIG_XTENSA_TOOLCHAIN_XCC),y)
   CROSSDEV = xt-
 endif
 
-ifeq ($(CONFIG_XTENSA_TOOLCHAIN_XCLANG), y)
+ifeq ($(CONFIG_XTENSA_TOOLCHAIN_XCLANG),y)
   CROSSDEV = xt-
 endif
 
-ifeq ($(CONFIG_XTENSA_TOOLCHAIN_ESP), y)
+ifeq ($(CONFIG_XTENSA_TOOLCHAIN_ESP),y)
   CROSSDEV = xtensa-esp32-elf-
 endif
 
@@ -172,13 +172,13 @@ ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
 endif
 
 # Default toolchain
-ifeq ($(CONFIG_XTENSA_TOOLCHAIN_XCC), y)
+ifeq ($(CONFIG_XTENSA_TOOLCHAIN_XCC),y)
   ARCHCFLAGS += -Wno-atomic-alignment
   ARCHCXXFLAGS += -Wno-atomic-alignment
   CC = $(CROSSDEV)xcc
   CXX = $(CROSSDEV)xc++
   CPP = $(CROSSDEV)xcc -E -P -x c
-else ifeq ($(CONFIG_XTENSA_TOOLCHAIN_XCLANG), y)
+else ifeq ($(CONFIG_XTENSA_TOOLCHAIN_XCLANG),y)
   CC = $(CROSSDEV)clang
   CXX = $(CROSSDEV)clang++
   CPP = $(CROSSDEV)clang -E -P -x c
diff --git a/arch/xtensa/src/lx7/Toolchain.defs b/arch/xtensa/src/lx7/Toolchain.defs
index a7241b69523..cd4e593230c 100644
--- a/arch/xtensa/src/lx7/Toolchain.defs
+++ b/arch/xtensa/src/lx7/Toolchain.defs
@@ -31,15 +31,15 @@
 #                   reliable code generation.
 #
 
-ifeq ($(CONFIG_XTENSA_TOOLCHAIN_XCC), y)
+ifeq ($(CONFIG_XTENSA_TOOLCHAIN_XCC),y)
   CROSSDEV = xt-
 endif
 
-ifeq ($(CONFIG_XTENSA_TOOLCHAIN_XCLANG), y)
+ifeq ($(CONFIG_XTENSA_TOOLCHAIN_XCLANG),y)
   CROSSDEV = xt-
 endif
 
-ifeq ($(CONFIG_XTENSA_TOOLCHAIN_ESP), y)
+ifeq ($(CONFIG_XTENSA_TOOLCHAIN_ESP),y)
   CROSSDEV = xtensa-$(CONFIG_ARCH_CHIP)-elf-
 endif
 
@@ -176,13 +176,13 @@ ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
 endif
 
 # Default toolchain
-ifeq ($(CONFIG_XTENSA_TOOLCHAIN_XCC), y)
+ifeq ($(CONFIG_XTENSA_TOOLCHAIN_XCC),y)
   ARCHCFLAGS += -Wno-atomic-alignment
   ARCHCXXFLAGS += -Wno-atomic-alignment
   CC = $(CROSSDEV)xcc
   CXX = $(CROSSDEV)xc++
   CPP = $(CROSSDEV)xcc -E -P -x c
-else ifeq ($(CONFIG_XTENSA_TOOLCHAIN_XCLANG), y)
+else ifeq ($(CONFIG_XTENSA_TOOLCHAIN_XCLANG),y)
   CC = $(CROSSDEV)clang
   CXX = $(CROSSDEV)clang++
   CPP = $(CROSSDEV)clang -E -P -x c