diff --git a/arch/xtensa/include/irq.h b/arch/xtensa/include/irq.h
index 19739e7944d..ed10e3bbb19 100644
--- a/arch/xtensa/include/irq.h
+++ b/arch/xtensa/include/irq.h
@@ -50,7 +50,7 @@
 
 /* Include architecture-specific IRQ definitions */
 
-#ifdef CONFIG_ARCH_CHIP_LX6
+#ifdef CONFIG_ARCH_FAMILY_LX6
 #  include <arch/lx6/irq.h>
 
 /* Include implementation-specific IRQ definitions (including IRQ numbers) */
diff --git a/arch/xtensa/include/types.h b/arch/xtensa/include/types.h
index aa987ff8bb3..ea8e19ff36b 100644
--- a/arch/xtensa/include/types.h
+++ b/arch/xtensa/include/types.h
@@ -69,8 +69,8 @@ typedef unsigned char      _uint8_t;
 typedef signed short       _int16_t;
 typedef unsigned short     _uint16_t;
 
-typedef signed int         _int32_t;
-typedef unsigned int       _uint32_t;
+typedef signed long        _int32_t;
+typedef unsigned long      _uint32_t;
 
 typedef signed long long   _int64_t;
 typedef unsigned long long _uint64_t;
@@ -78,12 +78,12 @@ typedef unsigned long long _uint64_t;
 
 /* A pointer is 4 bytes */
 
-typedef signed int         _intptr_t;
-typedef unsigned int       _uintptr_t;
+typedef signed long        _intptr_t;
+typedef unsigned long      _uintptr_t;
 
 /* This is the size of the interrupt state save returned by up_irq_save(). */
 
-typedef unsigned int       irqstate_t;
+typedef unsigned long      irqstate_t;
 
 #endif /* __ASSEMBLY__ */
 
diff --git a/arch/xtensa/src/lx6/Toolchain.defs b/arch/xtensa/src/lx6/Toolchain.defs
index e58071c20dc..b18659fe551 100644
--- a/arch/xtensa/src/lx6/Toolchain.defs
+++ b/arch/xtensa/src/lx6/Toolchain.defs
@@ -33,4 +33,4 @@
 #
 ############################################################################
 
-CROSSDEV = xtensa-esp32-
+CROSSDEV = xtensa-esp32-elf-
diff --git a/configs/esp32-core/nsh/setenv.sh b/configs/esp32-core/nsh/setenv.sh
index dedaec89239..3c57c18b554 100644
--- a/configs/esp32-core/nsh/setenv.sh
+++ b/configs/esp32-core/nsh/setenv.sh
@@ -49,7 +49,7 @@ fi
 
 # This is the path to the location where I installed the Expressif crosstools-NG
 # toolchaing
-export TOOLCHAIN_BIN="home/patacongo/projects/nuttx/crosstool-NG/builds/xtensa-esp32-elf/bin"
+export TOOLCHAIN_BIN="/home/patacongo/projects/nuttx/crosstool-NG/builds/xtensa-esp32-elf/bin"
 
 # Add the path to the toolchain to the PATH variable
 export PATH="${TOOLCHAIN_BIN}:/sbin:/usr/sbin:${PATH_ORIG}"