diff --git a/hw/bsp/esp32s2_saola/board.mk b/hw/bsp/esp32s2_saola/board.mk
index 92ca884c..167ef622 100644
--- a/hw/bsp/esp32s2_saola/board.mk
+++ b/hw/bsp/esp32s2_saola/board.mk
@@ -1,2 +1,2 @@
 # Cross Compiler for ESP32
-CROSS_COMPILE = xtensa-esp32-elf-
+CROSS_COMPILE = xtensa-esp32s2-elf-
diff --git a/tools/build_all.py b/tools/build_all.py
index 325e671f..ba918425 100644
--- a/tools/build_all.py
+++ b/tools/build_all.py
@@ -58,7 +58,7 @@ def skip_example(example, board):
         mk_contents = mk.read()
 
         # Skip ESP32-S2 board if example is not FreeRTOS one
-        if 'freertos' not in example and 'CROSS_COMPILE = xtensa-esp32-elf-' in mk_contents:
+        if 'freertos' not in example and 'CROSS_COMPILE = xtensa-esp32s2-elf-' in mk_contents:
             return 1
 
         # Skip if CFG_TUSB_MCU in board.mk to match skip file