Fix bug in 'machine.SPI' when building without 'Display' module included

Improved detection of ARM platform in 'BUILD.sh'

Author: loboris

MicroPython_BUILD/build_func.sh

@@ -2,6 +2,8 @@
 fs_type_fat="no"
 fs_fat_sect=4096
 linplatform=""
+linprocessor=""
+linmachine=""
 
 #----------------
 get_arguments() {
@@ -260,6 +262,8 @@ check_OS() {
     else
 	    if [ "${machine}" == "Linux" ]; then
 		    linplatform="$(uname -i)"
+		    linprocessor="$(uname -p)"
+		    linmachine="$(uname -m)"
 		fi
         MK_SPIFFS_BIN="mkspiffs"
         MK_FATFS_BIN="mkfatfs"
@@ -356,7 +360,7 @@ check_Environment() {
             if [ "${linplatform}" == "i686" ]; then
                 echo "unpacking ${machine}/xtensa-esp32-elf (32bit)"
                 tar -xf ${machine}/xtensa-esp32-elf_32bit.tar.xz > /dev/null 2>&1
-            elif [ "${linplatform}" == "armv7l" ]; then
+            elif [ "${linplatform}" == "armv7l" ] || [ "${linprocessor}" == "armv7l" ] || [ "${linmachine}" == "armv7l" ]; then
                 echo "unpacking ${machine}/xtensa-esp32-elf (arm)"
                 tar -xf ${machine}/xtensa-esp32-elf_arm.tar.xz > /dev/null 2>&1
             else

MicroPython_BUILD/components/micropython/esp32/machine_hw_spi.c

@@ -24,6 +24,8 @@
  * THE SOFTWARE.
  */
 
+#include "sdkconfig.h"
+
 #include <stdio.h>
 #include <stdint.h>
 #include <string.h>
@@ -74,12 +76,16 @@ typedef struct _machine_hw_spi_obj_t {
     } state;
 } machine_hw_spi_obj_t;
 
+#ifdef CONFIG_MICROPY_USE_DISPLAY
 extern uint8_t disp_used_spi_host;
+#endif
 
 //-----------------------------------------------------------------
 int checkSPIBUS(int8_t bus, int8_t mosi, uint8_t miso, uint8_t sck)
 {
+	#ifdef CONFIG_MICROPY_USE_DISPLAY
     if ((disp_used_spi_host > 0) && (MPy_SPIbus[disp_used_spi_host]->mosi_io_num >= 0)) return -3; // bus used by display driver
+	#endif
 
     if (MPy_SPIbus[bus] == NULL) return -2;					// bus not available
 	if (MPy_SPIbus[bus]->mosi_io_num < 0) return 1;			// bus not configured, free to use