ports/esp32/Makefile: Now supports BOARD_DIR.

chrisovergaauw · chrisovergaauw · commit ff4bc1226712 · 2022-12-20T16:18:17.000+01:00
ports/esp32/CMakeLists.txt: Now accepts relative path for BOARD_DIR.
diff --git a/ports/esp32/CMakeLists.txt b/ports/esp32/CMakeLists.txt
@@ -13,6 +13,10 @@ endif()
 # Set the board directory and check that it exists.
 if(NOT MICROPY_BOARD_DIR)
     set(MICROPY_BOARD_DIR ${MICROPY_PORT_DIR}/boards/${MICROPY_BOARD})
+else()
+    if(NOT IS_ABSOLUTE "${MICROPY_BOARD_DIR}")
+        set(MICROPY_BOARD_DIR "${MICROPY_PORT_DIR}/${MICROPY_BOARD_DIR}")
+    endif()
 endif()
 if(NOT EXISTS ${MICROPY_BOARD_DIR}/mpconfigboard.cmake)
     message(FATAL_ERROR "Invalid MICROPY_BOARD specified: ${MICROPY_BOARD}")
diff --git a/ports/esp32/Makefile b/ports/esp32/Makefile
@@ -5,6 +5,11 @@
 # Select the board to build for, defaulting to GENERIC.
 BOARD ?= GENERIC
 
+BOARD_DIR ?= boards/$(BOARD)
+ifeq ($(wildcard $(BOARD_DIR)/.),)
+$(error Invalid BOARD specified: $(BOARD_DIR))
+endif
+
 # If the build directory is not given, make it reflect the board name.
 BUILD ?= build-$(BOARD)
 
@@ -28,7 +33,7 @@ ifdef USER_C_MODULES
 	CMAKE_ARGS += -DUSER_C_MODULES=${USER_C_MODULES}
 endif
 
-IDFPY_FLAGS += -D MICROPY_BOARD=$(BOARD) -B $(BUILD) $(CMAKE_ARGS)
+IDFPY_FLAGS += -D MICROPY_BOARD_DIR=$(BOARD_DIR) -D MICROPY_BOARD=$(BOARD) -B $(BUILD) $(CMAKE_ARGS)
 
 ifdef FROZEN_MANIFEST
        IDFPY_FLAGS += -D MICROPY_FROZEN_MANIFEST=$(FROZEN_MANIFEST)
