processing menu-items automatically (#35)

* processing menu-items automatically

* remove echo

avr.mk

@@ -11,8 +11,6 @@ PROCESSOR_FAMILY := avr
 
 -include hardware.mk
 
-$(call define-menu-variables,cpu)
-
 serial.port := $(SERIAL_PORT)
 upload.verbose := $(tools.$(upload.tool).upload.params.$(UPLOAD_VERBOSE))
 upload.verify := $(UPLOAD_VERIFY)

esp32.mk

@@ -28,8 +28,6 @@ build.target := esp32
 # this is required for recipel.hooks.prebuild.4.pattern (but shouldn't be)
 tools.esptool_py.cmd := $(call os-override,tools.esptool_py.cmd)
 
-$(call define-menus,JTAGAdapter PSRAM PartitionScheme CPUFreq FlashMode FlashFreq FlashSize UploadSpeed LoopCore EventsCore DebugLevel EraseFlash)
-
 SUFFIX_EEP := partitions.bin
 
 -include build-targets.mk

esp8266.mk

@@ -33,8 +33,6 @@ PROCESSOR_FAMILY := esp8266
 
 -include hardware.mk
 
-$(call define-menus,xtal vt exception stacksmash ssl mmu non32xfer ResetMethod CrystalFreq FlashFreq FlashMode eesz led sdk ip dbg lvl wipe baud)
-
 # ???
 upload.maximum_size := $(menu.eesz.autoflash.upload.maximum_size)
 upload.verbose = $(tools.$(upload.tool).upload.params.$(UPLOAD_VERBOSE))

hardware.mk

@@ -44,11 +44,11 @@ $1 = $2
 endef
 
 define define-prefix-variables
-$(foreach v, $(filter $1.%, $(.VARIABLES)), $(eval $(call define-variable,$(v:$1.%=%), $($(v)))))
+$(foreach v,$(filter $1.%, $(.VARIABLES)), $(eval $(call define-variable,$(v:$1.%=%),$($(v)))))
 endef
 
 define define-menu-variables
-$(call define-prefix-variables,menu.$1.$($(shell echo $1 | tr a-z A-Z)))
+$(call define-prefix-variables,$(BOARD).menu.$1.$($(shell echo $1 | tr a-z A-Z)))
 endef
 
 define define-menus
@@ -57,13 +57,15 @@ endef
 
 $(call define-prefix-variables,$(BOARD))
 
+$(call define-menus,$(foreach m,$(filter menu.%,$(.VARIABLES)),$(m:menu.%=%)))
+
 SKETCH ?= $(wildcard *.ino)
 COMPILER_WARNINGS ?= default
 
 build.project_name := $(SKETCH)
 build.arch := $(PROCESSOR_FAMILY)
 build.fqbn := $(VENDOR):$(PROCESSOR_FAMILY):$(BOARD)
-build.core.path := $(runtime.platform.path)/cores/$(build.core)
+build.core.path = $(runtime.platform.path)/cores/$(build.core)
 build.variant.path = $(runtime.platform.path)/variants/$(build.variant)
 build.system.path = $(runtime.platform.path)/system
 build.path := .build

tiny.mk

@@ -16,8 +16,6 @@ COMPILER_PATH := $(lastword $(wildcard $(PACKAGES)/arduino/tools/$(COMPILER_FAMI
 
 runtime.tools.$(COMPILER_FAMILY).path := $(COMPILER_PATH)
 
--include hardware.mk
-
 # menus
 PINMAPPING ?= anew
 LTO ?= enable
@@ -26,11 +24,7 @@ EESAVE ?= aenable
 MILLIS ?= enabled
 NEOPIXELPORT ?= porta
 
-CHIP := $(firstword $(chip) $(CHIP))
-CLOCK := $(firstword $(clock) $(CLOCK))
-PINMAPPING := $(firstword $(pinmapping) $(PINMAPPING))
-
-$(call define-menus,chip clock pinmapping LTO bod eesave millis neopixelport)
+-include hardware.mk
 
 serial.port := $(SERIAL_PORT)
 upload.verbose := $(tools.$(upload.tool).upload.params.$(UPLOAD_VERBOSE))