From c316b83d5f2eb6bfa3d661d32547fbf83598c18a Mon Sep 17 00:00:00 2001 From: EricB-ADI <122300463+EricB-ADI@users.noreply.github.com> Date: Thu, 9 Jan 2025 11:21:07 -0600 Subject: [PATCH] fix(MAXUSB): Updated makefiles for USB examples (#1319) Co-authored-by: eric --- .gitignore | 1 + .../MAX32650/USB/MAXUSB/USB_CDCACM/Makefile | 2 +- .../USB_CompositeDevice_MSC_CDC/Makefile | 2 +- .../USB_CompositeDevice_MSC_HID/Makefile | 2 +- .../USB/MAXUSB/USB_HIDKeyboard/Makefile | 2 +- .../USB/MAXUSB/USB_MassStorage/Makefile | 2 +- .../MAX32650/USB/TinyUSB/cdc_msc/Makefile | 2 +- .../USB/TinyUSB/cdc_msc_freertos/Makefile | 2 +- .../USB/TinyUSB/hid_composite/Makefile | 2 +- .../USB/TinyUSB/msc_dual_lun/Makefile | 2 +- .../MAX32665/USB/MAXUSB/USB_CDCACM/Makefile | 2 +- .../USB_CompositeDevice_MSC_CDC/Makefile | 2 +- .../USB_CompositeDevice_MSC_HID/Makefile | 2 +- .../USB/MAXUSB/USB_HIDKeyboard/Makefile | 2 +- .../USB/MAXUSB/USB_MassStorage/Makefile | 2 +- .../MAX32665/USB/TinyUSB/cdc_msc/Makefile | 2 +- .../USB/TinyUSB/cdc_msc_freertos/Makefile | 2 +- .../USB/TinyUSB/hid_composite/Makefile | 2 +- .../USB/TinyUSB/msc_dual_lun/Makefile | 2 +- Examples/MAX32690/USB/.gitignore | 1 + .../MAX32690/USB/MAXUSB/USB_CDCACM/Makefile | 2 +- .../USB_CompositeDevice_MSC_CDC/Makefile | 2 +- .../USB_CompositeDevice_MSC_HID/Makefile | 2 +- .../USB/MAXUSB/USB_HIDKeyboard/Makefile | 2 +- .../USB/MAXUSB/USB_MassStorage/Makefile | 2 +- .../MAX32690/USB/TinyUSB/cdc_msc/Makefile | 2 +- .../USB/TinyUSB/cdc_msc_freertos/Makefile | 2 +- .../USB/TinyUSB/hid_composite/Makefile | 2 +- .../USB/TinyUSB/msc_dual_lun/Makefile | 2 +- .../USB/TinyUSB/msc_ext_flash/Makefile | 2 +- .../USB/TinyUSB/msc_ext_flash/msc_ext_flash.c | 3 --- .../MAX78002/USB/MAXUSB/USB_CDCACM/Makefile | 2 +- .../USB_CompositeDevice_MSC_CDC/Makefile | 2 +- .../USB_CompositeDevice_MSC_HID/Makefile | 2 +- .../USB/MAXUSB/USB_HIDKeyboard/Makefile | 2 +- .../USB/MAXUSB/USB_MassStorage/Makefile | 2 +- .../USB_MassStorage_ThroughPut/Makefile | 2 +- .../MAX78002/USB/TinyUSB/cdc_msc/Makefile | 2 +- .../USB/TinyUSB/cdc_msc_freertos/Makefile | 2 +- .../USB/TinyUSB/hid_composite/Makefile | 2 +- .../USB/TinyUSB/msc_dual_lun/Makefile | 2 +- .../CMSIS/Device/Maxim/GCC/mxc_version.mk | 24 ------------------- 42 files changed, 40 insertions(+), 65 deletions(-) create mode 100644 Examples/MAX32690/USB/.gitignore delete mode 100644 Libraries/CMSIS/Device/Maxim/GCC/mxc_version.mk diff --git a/.gitignore b/.gitignore index 3573714a36a..3beee389c76 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ Examples/*/*/build +Examples/**/build Examples/*/*/buildrv Examples/*/*/*/build Examples/*/*/*/buildrv diff --git a/Examples/MAX32650/USB/MAXUSB/USB_CDCACM/Makefile b/Examples/MAX32650/USB/MAXUSB/USB_CDCACM/Makefile index 71bc32d20b4..20d7046637d 100644 --- a/Examples/MAX32650/USB/MAXUSB/USB_CDCACM/Makefile +++ b/Examples/MAX32650/USB/MAXUSB/USB_CDCACM/Makefile @@ -100,7 +100,7 @@ $(info Loaded project.mk) ifeq "$(MAXIM_PATH)" "" # MAXIM_PATH is still not defined... -DEPTH := ../../../../ +DEPTH := ../../../../../ MAXIM_PATH := $(abspath $(DEPTH)) $(warning Warning: MAXIM_PATH is not set! Set MAXIM_PATH in your environment or in project.mk to clear this warning.) $(warning Warning: Attempting to use $(MAXIM_PATH) calculated from relative path) diff --git a/Examples/MAX32650/USB/MAXUSB/USB_CompositeDevice_MSC_CDC/Makefile b/Examples/MAX32650/USB/MAXUSB/USB_CompositeDevice_MSC_CDC/Makefile index 71bc32d20b4..20d7046637d 100644 --- a/Examples/MAX32650/USB/MAXUSB/USB_CompositeDevice_MSC_CDC/Makefile +++ b/Examples/MAX32650/USB/MAXUSB/USB_CompositeDevice_MSC_CDC/Makefile @@ -100,7 +100,7 @@ $(info Loaded project.mk) ifeq "$(MAXIM_PATH)" "" # MAXIM_PATH is still not defined... -DEPTH := ../../../../ +DEPTH := ../../../../../ MAXIM_PATH := $(abspath $(DEPTH)) $(warning Warning: MAXIM_PATH is not set! Set MAXIM_PATH in your environment or in project.mk to clear this warning.) $(warning Warning: Attempting to use $(MAXIM_PATH) calculated from relative path) diff --git a/Examples/MAX32650/USB/MAXUSB/USB_CompositeDevice_MSC_HID/Makefile b/Examples/MAX32650/USB/MAXUSB/USB_CompositeDevice_MSC_HID/Makefile index 71bc32d20b4..20d7046637d 100644 --- a/Examples/MAX32650/USB/MAXUSB/USB_CompositeDevice_MSC_HID/Makefile +++ b/Examples/MAX32650/USB/MAXUSB/USB_CompositeDevice_MSC_HID/Makefile @@ -100,7 +100,7 @@ $(info Loaded project.mk) ifeq "$(MAXIM_PATH)" "" # MAXIM_PATH is still not defined... -DEPTH := ../../../../ +DEPTH := ../../../../../ MAXIM_PATH := $(abspath $(DEPTH)) $(warning Warning: MAXIM_PATH is not set! Set MAXIM_PATH in your environment or in project.mk to clear this warning.) $(warning Warning: Attempting to use $(MAXIM_PATH) calculated from relative path) diff --git a/Examples/MAX32650/USB/MAXUSB/USB_HIDKeyboard/Makefile b/Examples/MAX32650/USB/MAXUSB/USB_HIDKeyboard/Makefile index 6d97c8e0fb3..95417eb251c 100644 --- a/Examples/MAX32650/USB/MAXUSB/USB_HIDKeyboard/Makefile +++ b/Examples/MAX32650/USB/MAXUSB/USB_HIDKeyboard/Makefile @@ -100,7 +100,7 @@ $(info Loaded project.mk) ifeq "$(MAXIM_PATH)" "" # MAXIM_PATH is still not defined... -DEPTH := ../../../../ +DEPTH := ../../../../../ MAXIM_PATH := $(abspath $(DEPTH)) $(warning Warning: MAXIM_PATH is not set! Set MAXIM_PATH in your environment or in project.mk to clear this warning.) $(warning Warning: Attempting to use $(MAXIM_PATH) calculated from relative path) diff --git a/Examples/MAX32650/USB/MAXUSB/USB_MassStorage/Makefile b/Examples/MAX32650/USB/MAXUSB/USB_MassStorage/Makefile index 6d97c8e0fb3..95417eb251c 100644 --- a/Examples/MAX32650/USB/MAXUSB/USB_MassStorage/Makefile +++ b/Examples/MAX32650/USB/MAXUSB/USB_MassStorage/Makefile @@ -100,7 +100,7 @@ $(info Loaded project.mk) ifeq "$(MAXIM_PATH)" "" # MAXIM_PATH is still not defined... -DEPTH := ../../../../ +DEPTH := ../../../../../ MAXIM_PATH := $(abspath $(DEPTH)) $(warning Warning: MAXIM_PATH is not set! Set MAXIM_PATH in your environment or in project.mk to clear this warning.) $(warning Warning: Attempting to use $(MAXIM_PATH) calculated from relative path) diff --git a/Examples/MAX32650/USB/TinyUSB/cdc_msc/Makefile b/Examples/MAX32650/USB/TinyUSB/cdc_msc/Makefile index 71bc32d20b4..20d7046637d 100644 --- a/Examples/MAX32650/USB/TinyUSB/cdc_msc/Makefile +++ b/Examples/MAX32650/USB/TinyUSB/cdc_msc/Makefile @@ -100,7 +100,7 @@ $(info Loaded project.mk) ifeq "$(MAXIM_PATH)" "" # MAXIM_PATH is still not defined... -DEPTH := ../../../../ +DEPTH := ../../../../../ MAXIM_PATH := $(abspath $(DEPTH)) $(warning Warning: MAXIM_PATH is not set! Set MAXIM_PATH in your environment or in project.mk to clear this warning.) $(warning Warning: Attempting to use $(MAXIM_PATH) calculated from relative path) diff --git a/Examples/MAX32650/USB/TinyUSB/cdc_msc_freertos/Makefile b/Examples/MAX32650/USB/TinyUSB/cdc_msc_freertos/Makefile index 71bc32d20b4..20d7046637d 100644 --- a/Examples/MAX32650/USB/TinyUSB/cdc_msc_freertos/Makefile +++ b/Examples/MAX32650/USB/TinyUSB/cdc_msc_freertos/Makefile @@ -100,7 +100,7 @@ $(info Loaded project.mk) ifeq "$(MAXIM_PATH)" "" # MAXIM_PATH is still not defined... -DEPTH := ../../../../ +DEPTH := ../../../../../ MAXIM_PATH := $(abspath $(DEPTH)) $(warning Warning: MAXIM_PATH is not set! Set MAXIM_PATH in your environment or in project.mk to clear this warning.) $(warning Warning: Attempting to use $(MAXIM_PATH) calculated from relative path) diff --git a/Examples/MAX32650/USB/TinyUSB/hid_composite/Makefile b/Examples/MAX32650/USB/TinyUSB/hid_composite/Makefile index 6d97c8e0fb3..95417eb251c 100644 --- a/Examples/MAX32650/USB/TinyUSB/hid_composite/Makefile +++ b/Examples/MAX32650/USB/TinyUSB/hid_composite/Makefile @@ -100,7 +100,7 @@ $(info Loaded project.mk) ifeq "$(MAXIM_PATH)" "" # MAXIM_PATH is still not defined... -DEPTH := ../../../../ +DEPTH := ../../../../../ MAXIM_PATH := $(abspath $(DEPTH)) $(warning Warning: MAXIM_PATH is not set! Set MAXIM_PATH in your environment or in project.mk to clear this warning.) $(warning Warning: Attempting to use $(MAXIM_PATH) calculated from relative path) diff --git a/Examples/MAX32650/USB/TinyUSB/msc_dual_lun/Makefile b/Examples/MAX32650/USB/TinyUSB/msc_dual_lun/Makefile index 6d97c8e0fb3..95417eb251c 100644 --- a/Examples/MAX32650/USB/TinyUSB/msc_dual_lun/Makefile +++ b/Examples/MAX32650/USB/TinyUSB/msc_dual_lun/Makefile @@ -100,7 +100,7 @@ $(info Loaded project.mk) ifeq "$(MAXIM_PATH)" "" # MAXIM_PATH is still not defined... -DEPTH := ../../../../ +DEPTH := ../../../../../ MAXIM_PATH := $(abspath $(DEPTH)) $(warning Warning: MAXIM_PATH is not set! Set MAXIM_PATH in your environment or in project.mk to clear this warning.) $(warning Warning: Attempting to use $(MAXIM_PATH) calculated from relative path) diff --git a/Examples/MAX32665/USB/MAXUSB/USB_CDCACM/Makefile b/Examples/MAX32665/USB/MAXUSB/USB_CDCACM/Makefile index a1375f471f3..664bd8dbd0a 100644 --- a/Examples/MAX32665/USB/MAXUSB/USB_CDCACM/Makefile +++ b/Examples/MAX32665/USB/MAXUSB/USB_CDCACM/Makefile @@ -100,7 +100,7 @@ $(info Loaded project.mk) ifeq "$(MAXIM_PATH)" "" # MAXIM_PATH is still not defined... -DEPTH := ../../../../ +DEPTH := ../../../../../ MAXIM_PATH := $(abspath $(DEPTH)) $(warning Warning: MAXIM_PATH is not set! Set MAXIM_PATH in your environment or in project.mk to clear this warning.) $(warning Warning: Attempting to use $(MAXIM_PATH) calculated from relative path) diff --git a/Examples/MAX32665/USB/MAXUSB/USB_CompositeDevice_MSC_CDC/Makefile b/Examples/MAX32665/USB/MAXUSB/USB_CompositeDevice_MSC_CDC/Makefile index e08182e4384..30a50a3e0d0 100644 --- a/Examples/MAX32665/USB/MAXUSB/USB_CompositeDevice_MSC_CDC/Makefile +++ b/Examples/MAX32665/USB/MAXUSB/USB_CompositeDevice_MSC_CDC/Makefile @@ -100,7 +100,7 @@ $(info Loaded project.mk) ifeq "$(MAXIM_PATH)" "" # MAXIM_PATH is still not defined... -DEPTH := ../../../../ +DEPTH := ../../../../../ MAXIM_PATH := $(abspath $(DEPTH)) $(warning Warning: MAXIM_PATH is not set! Set MAXIM_PATH in your environment or in project.mk to clear this warning.) $(warning Warning: Attempting to use $(MAXIM_PATH) calculated from relative path) diff --git a/Examples/MAX32665/USB/MAXUSB/USB_CompositeDevice_MSC_HID/Makefile b/Examples/MAX32665/USB/MAXUSB/USB_CompositeDevice_MSC_HID/Makefile index e08182e4384..30a50a3e0d0 100644 --- a/Examples/MAX32665/USB/MAXUSB/USB_CompositeDevice_MSC_HID/Makefile +++ b/Examples/MAX32665/USB/MAXUSB/USB_CompositeDevice_MSC_HID/Makefile @@ -100,7 +100,7 @@ $(info Loaded project.mk) ifeq "$(MAXIM_PATH)" "" # MAXIM_PATH is still not defined... -DEPTH := ../../../../ +DEPTH := ../../../../../ MAXIM_PATH := $(abspath $(DEPTH)) $(warning Warning: MAXIM_PATH is not set! Set MAXIM_PATH in your environment or in project.mk to clear this warning.) $(warning Warning: Attempting to use $(MAXIM_PATH) calculated from relative path) diff --git a/Examples/MAX32665/USB/MAXUSB/USB_HIDKeyboard/Makefile b/Examples/MAX32665/USB/MAXUSB/USB_HIDKeyboard/Makefile index e08182e4384..30a50a3e0d0 100644 --- a/Examples/MAX32665/USB/MAXUSB/USB_HIDKeyboard/Makefile +++ b/Examples/MAX32665/USB/MAXUSB/USB_HIDKeyboard/Makefile @@ -100,7 +100,7 @@ $(info Loaded project.mk) ifeq "$(MAXIM_PATH)" "" # MAXIM_PATH is still not defined... -DEPTH := ../../../../ +DEPTH := ../../../../../ MAXIM_PATH := $(abspath $(DEPTH)) $(warning Warning: MAXIM_PATH is not set! Set MAXIM_PATH in your environment or in project.mk to clear this warning.) $(warning Warning: Attempting to use $(MAXIM_PATH) calculated from relative path) diff --git a/Examples/MAX32665/USB/MAXUSB/USB_MassStorage/Makefile b/Examples/MAX32665/USB/MAXUSB/USB_MassStorage/Makefile index e08182e4384..30a50a3e0d0 100644 --- a/Examples/MAX32665/USB/MAXUSB/USB_MassStorage/Makefile +++ b/Examples/MAX32665/USB/MAXUSB/USB_MassStorage/Makefile @@ -100,7 +100,7 @@ $(info Loaded project.mk) ifeq "$(MAXIM_PATH)" "" # MAXIM_PATH is still not defined... -DEPTH := ../../../../ +DEPTH := ../../../../../ MAXIM_PATH := $(abspath $(DEPTH)) $(warning Warning: MAXIM_PATH is not set! Set MAXIM_PATH in your environment or in project.mk to clear this warning.) $(warning Warning: Attempting to use $(MAXIM_PATH) calculated from relative path) diff --git a/Examples/MAX32665/USB/TinyUSB/cdc_msc/Makefile b/Examples/MAX32665/USB/TinyUSB/cdc_msc/Makefile index a1375f471f3..664bd8dbd0a 100644 --- a/Examples/MAX32665/USB/TinyUSB/cdc_msc/Makefile +++ b/Examples/MAX32665/USB/TinyUSB/cdc_msc/Makefile @@ -100,7 +100,7 @@ $(info Loaded project.mk) ifeq "$(MAXIM_PATH)" "" # MAXIM_PATH is still not defined... -DEPTH := ../../../../ +DEPTH := ../../../../../ MAXIM_PATH := $(abspath $(DEPTH)) $(warning Warning: MAXIM_PATH is not set! Set MAXIM_PATH in your environment or in project.mk to clear this warning.) $(warning Warning: Attempting to use $(MAXIM_PATH) calculated from relative path) diff --git a/Examples/MAX32665/USB/TinyUSB/cdc_msc_freertos/Makefile b/Examples/MAX32665/USB/TinyUSB/cdc_msc_freertos/Makefile index a1375f471f3..664bd8dbd0a 100644 --- a/Examples/MAX32665/USB/TinyUSB/cdc_msc_freertos/Makefile +++ b/Examples/MAX32665/USB/TinyUSB/cdc_msc_freertos/Makefile @@ -100,7 +100,7 @@ $(info Loaded project.mk) ifeq "$(MAXIM_PATH)" "" # MAXIM_PATH is still not defined... -DEPTH := ../../../../ +DEPTH := ../../../../../ MAXIM_PATH := $(abspath $(DEPTH)) $(warning Warning: MAXIM_PATH is not set! Set MAXIM_PATH in your environment or in project.mk to clear this warning.) $(warning Warning: Attempting to use $(MAXIM_PATH) calculated from relative path) diff --git a/Examples/MAX32665/USB/TinyUSB/hid_composite/Makefile b/Examples/MAX32665/USB/TinyUSB/hid_composite/Makefile index a1375f471f3..664bd8dbd0a 100644 --- a/Examples/MAX32665/USB/TinyUSB/hid_composite/Makefile +++ b/Examples/MAX32665/USB/TinyUSB/hid_composite/Makefile @@ -100,7 +100,7 @@ $(info Loaded project.mk) ifeq "$(MAXIM_PATH)" "" # MAXIM_PATH is still not defined... -DEPTH := ../../../../ +DEPTH := ../../../../../ MAXIM_PATH := $(abspath $(DEPTH)) $(warning Warning: MAXIM_PATH is not set! Set MAXIM_PATH in your environment or in project.mk to clear this warning.) $(warning Warning: Attempting to use $(MAXIM_PATH) calculated from relative path) diff --git a/Examples/MAX32665/USB/TinyUSB/msc_dual_lun/Makefile b/Examples/MAX32665/USB/TinyUSB/msc_dual_lun/Makefile index a1375f471f3..664bd8dbd0a 100644 --- a/Examples/MAX32665/USB/TinyUSB/msc_dual_lun/Makefile +++ b/Examples/MAX32665/USB/TinyUSB/msc_dual_lun/Makefile @@ -100,7 +100,7 @@ $(info Loaded project.mk) ifeq "$(MAXIM_PATH)" "" # MAXIM_PATH is still not defined... -DEPTH := ../../../../ +DEPTH := ../../../../../ MAXIM_PATH := $(abspath $(DEPTH)) $(warning Warning: MAXIM_PATH is not set! Set MAXIM_PATH in your environment or in project.mk to clear this warning.) $(warning Warning: Attempting to use $(MAXIM_PATH) calculated from relative path) diff --git a/Examples/MAX32690/USB/.gitignore b/Examples/MAX32690/USB/.gitignore new file mode 100644 index 00000000000..378eac25d31 --- /dev/null +++ b/Examples/MAX32690/USB/.gitignore @@ -0,0 +1 @@ +build diff --git a/Examples/MAX32690/USB/MAXUSB/USB_CDCACM/Makefile b/Examples/MAX32690/USB/MAXUSB/USB_CDCACM/Makefile index d6ae4b890bf..290068009ed 100644 --- a/Examples/MAX32690/USB/MAXUSB/USB_CDCACM/Makefile +++ b/Examples/MAX32690/USB/MAXUSB/USB_CDCACM/Makefile @@ -100,7 +100,7 @@ $(info Loaded project.mk) ifeq "$(MAXIM_PATH)" "" # MAXIM_PATH is still not defined... -DEPTH := ../../../../ +DEPTH := ../../../../../.. MAXIM_PATH := $(abspath $(DEPTH)) $(warning Warning: MAXIM_PATH is not set! Set MAXIM_PATH in your environment or in project.mk to clear this warning.) $(warning Warning: Attempting to use $(MAXIM_PATH) calculated from relative path) diff --git a/Examples/MAX32690/USB/MAXUSB/USB_CompositeDevice_MSC_CDC/Makefile b/Examples/MAX32690/USB/MAXUSB/USB_CompositeDevice_MSC_CDC/Makefile index d6ae4b890bf..290068009ed 100644 --- a/Examples/MAX32690/USB/MAXUSB/USB_CompositeDevice_MSC_CDC/Makefile +++ b/Examples/MAX32690/USB/MAXUSB/USB_CompositeDevice_MSC_CDC/Makefile @@ -100,7 +100,7 @@ $(info Loaded project.mk) ifeq "$(MAXIM_PATH)" "" # MAXIM_PATH is still not defined... -DEPTH := ../../../../ +DEPTH := ../../../../../.. MAXIM_PATH := $(abspath $(DEPTH)) $(warning Warning: MAXIM_PATH is not set! Set MAXIM_PATH in your environment or in project.mk to clear this warning.) $(warning Warning: Attempting to use $(MAXIM_PATH) calculated from relative path) diff --git a/Examples/MAX32690/USB/MAXUSB/USB_CompositeDevice_MSC_HID/Makefile b/Examples/MAX32690/USB/MAXUSB/USB_CompositeDevice_MSC_HID/Makefile index d6ae4b890bf..290068009ed 100644 --- a/Examples/MAX32690/USB/MAXUSB/USB_CompositeDevice_MSC_HID/Makefile +++ b/Examples/MAX32690/USB/MAXUSB/USB_CompositeDevice_MSC_HID/Makefile @@ -100,7 +100,7 @@ $(info Loaded project.mk) ifeq "$(MAXIM_PATH)" "" # MAXIM_PATH is still not defined... -DEPTH := ../../../../ +DEPTH := ../../../../../.. MAXIM_PATH := $(abspath $(DEPTH)) $(warning Warning: MAXIM_PATH is not set! Set MAXIM_PATH in your environment or in project.mk to clear this warning.) $(warning Warning: Attempting to use $(MAXIM_PATH) calculated from relative path) diff --git a/Examples/MAX32690/USB/MAXUSB/USB_HIDKeyboard/Makefile b/Examples/MAX32690/USB/MAXUSB/USB_HIDKeyboard/Makefile index d6ae4b890bf..290068009ed 100644 --- a/Examples/MAX32690/USB/MAXUSB/USB_HIDKeyboard/Makefile +++ b/Examples/MAX32690/USB/MAXUSB/USB_HIDKeyboard/Makefile @@ -100,7 +100,7 @@ $(info Loaded project.mk) ifeq "$(MAXIM_PATH)" "" # MAXIM_PATH is still not defined... -DEPTH := ../../../../ +DEPTH := ../../../../../.. MAXIM_PATH := $(abspath $(DEPTH)) $(warning Warning: MAXIM_PATH is not set! Set MAXIM_PATH in your environment or in project.mk to clear this warning.) $(warning Warning: Attempting to use $(MAXIM_PATH) calculated from relative path) diff --git a/Examples/MAX32690/USB/MAXUSB/USB_MassStorage/Makefile b/Examples/MAX32690/USB/MAXUSB/USB_MassStorage/Makefile index d6ae4b890bf..290068009ed 100644 --- a/Examples/MAX32690/USB/MAXUSB/USB_MassStorage/Makefile +++ b/Examples/MAX32690/USB/MAXUSB/USB_MassStorage/Makefile @@ -100,7 +100,7 @@ $(info Loaded project.mk) ifeq "$(MAXIM_PATH)" "" # MAXIM_PATH is still not defined... -DEPTH := ../../../../ +DEPTH := ../../../../../.. MAXIM_PATH := $(abspath $(DEPTH)) $(warning Warning: MAXIM_PATH is not set! Set MAXIM_PATH in your environment or in project.mk to clear this warning.) $(warning Warning: Attempting to use $(MAXIM_PATH) calculated from relative path) diff --git a/Examples/MAX32690/USB/TinyUSB/cdc_msc/Makefile b/Examples/MAX32690/USB/TinyUSB/cdc_msc/Makefile index 83cdb608d37..ee6a94fbd1b 100644 --- a/Examples/MAX32690/USB/TinyUSB/cdc_msc/Makefile +++ b/Examples/MAX32690/USB/TinyUSB/cdc_msc/Makefile @@ -100,7 +100,7 @@ $(info Loaded project.mk) ifeq "$(MAXIM_PATH)" "" # MAXIM_PATH is still not defined... -DEPTH := ../../../../ +DEPTH := ../../../../../.. MAXIM_PATH := $(abspath $(DEPTH)) $(warning Warning: MAXIM_PATH is not set! Set MAXIM_PATH in your environment or in project.mk to clear this warning.) $(warning Warning: Attempting to use $(MAXIM_PATH) calculated from relative path) diff --git a/Examples/MAX32690/USB/TinyUSB/cdc_msc_freertos/Makefile b/Examples/MAX32690/USB/TinyUSB/cdc_msc_freertos/Makefile index 83cdb608d37..ee6a94fbd1b 100644 --- a/Examples/MAX32690/USB/TinyUSB/cdc_msc_freertos/Makefile +++ b/Examples/MAX32690/USB/TinyUSB/cdc_msc_freertos/Makefile @@ -100,7 +100,7 @@ $(info Loaded project.mk) ifeq "$(MAXIM_PATH)" "" # MAXIM_PATH is still not defined... -DEPTH := ../../../../ +DEPTH := ../../../../../.. MAXIM_PATH := $(abspath $(DEPTH)) $(warning Warning: MAXIM_PATH is not set! Set MAXIM_PATH in your environment or in project.mk to clear this warning.) $(warning Warning: Attempting to use $(MAXIM_PATH) calculated from relative path) diff --git a/Examples/MAX32690/USB/TinyUSB/hid_composite/Makefile b/Examples/MAX32690/USB/TinyUSB/hid_composite/Makefile index 83cdb608d37..ee6a94fbd1b 100644 --- a/Examples/MAX32690/USB/TinyUSB/hid_composite/Makefile +++ b/Examples/MAX32690/USB/TinyUSB/hid_composite/Makefile @@ -100,7 +100,7 @@ $(info Loaded project.mk) ifeq "$(MAXIM_PATH)" "" # MAXIM_PATH is still not defined... -DEPTH := ../../../../ +DEPTH := ../../../../../.. MAXIM_PATH := $(abspath $(DEPTH)) $(warning Warning: MAXIM_PATH is not set! Set MAXIM_PATH in your environment or in project.mk to clear this warning.) $(warning Warning: Attempting to use $(MAXIM_PATH) calculated from relative path) diff --git a/Examples/MAX32690/USB/TinyUSB/msc_dual_lun/Makefile b/Examples/MAX32690/USB/TinyUSB/msc_dual_lun/Makefile index 83cdb608d37..ee6a94fbd1b 100644 --- a/Examples/MAX32690/USB/TinyUSB/msc_dual_lun/Makefile +++ b/Examples/MAX32690/USB/TinyUSB/msc_dual_lun/Makefile @@ -100,7 +100,7 @@ $(info Loaded project.mk) ifeq "$(MAXIM_PATH)" "" # MAXIM_PATH is still not defined... -DEPTH := ../../../../ +DEPTH := ../../../../../.. MAXIM_PATH := $(abspath $(DEPTH)) $(warning Warning: MAXIM_PATH is not set! Set MAXIM_PATH in your environment or in project.mk to clear this warning.) $(warning Warning: Attempting to use $(MAXIM_PATH) calculated from relative path) diff --git a/Examples/MAX32690/USB/TinyUSB/msc_ext_flash/Makefile b/Examples/MAX32690/USB/TinyUSB/msc_ext_flash/Makefile index b210c698c06..1c462ef6191 100644 --- a/Examples/MAX32690/USB/TinyUSB/msc_ext_flash/Makefile +++ b/Examples/MAX32690/USB/TinyUSB/msc_ext_flash/Makefile @@ -100,7 +100,7 @@ $(info Loaded project.mk) ifeq "$(MAXIM_PATH)" "" # MAXIM_PATH is still not defined... -DEPTH := ../../../../ +DEPTH := ../../../../../.. MAXIM_PATH := $(abspath $(DEPTH)) $(warning Warning: MAXIM_PATH is not set! Set MAXIM_PATH in your environment or in project.mk to clear this warning.) $(warning Warning: Attempting to use $(MAXIM_PATH) calculated from relative path) diff --git a/Examples/MAX32690/USB/TinyUSB/msc_ext_flash/msc_ext_flash.c b/Examples/MAX32690/USB/TinyUSB/msc_ext_flash/msc_ext_flash.c index e604c4cd1cf..b376678cd16 100644 --- a/Examples/MAX32690/USB/TinyUSB/msc_ext_flash/msc_ext_flash.c +++ b/Examples/MAX32690/USB/TinyUSB/msc_ext_flash/msc_ext_flash.c @@ -220,7 +220,6 @@ int32_t tud_msc_scsi_cb(uint8_t lun, uint8_t const scsi_cmd[16], void *buffer, u void spixf_disk_init() { - uint32_t id; if (!is_initialized) { Ext_Flash_Init(); Ext_Flash_Reset(); @@ -231,8 +230,6 @@ void spixf_disk_init() Ext_Flash_Quad(0); } - id = Ext_Flash_ID(); - is_initialized = true; } } diff --git a/Examples/MAX78002/USB/MAXUSB/USB_CDCACM/Makefile b/Examples/MAX78002/USB/MAXUSB/USB_CDCACM/Makefile index 54389988050..a990cf72e76 100644 --- a/Examples/MAX78002/USB/MAXUSB/USB_CDCACM/Makefile +++ b/Examples/MAX78002/USB/MAXUSB/USB_CDCACM/Makefile @@ -100,7 +100,7 @@ $(info Loaded project.mk) ifeq "$(MAXIM_PATH)" "" # MAXIM_PATH is still not defined... -DEPTH := ../../../../ +DEPTH := ../../../../../ MAXIM_PATH := $(abspath $(DEPTH)) $(warning Warning: MAXIM_PATH is not set! Set MAXIM_PATH in your environment or in project.mk to clear this warning.) $(warning Warning: Attempting to use $(MAXIM_PATH) calculated from relative path) diff --git a/Examples/MAX78002/USB/MAXUSB/USB_CompositeDevice_MSC_CDC/Makefile b/Examples/MAX78002/USB/MAXUSB/USB_CompositeDevice_MSC_CDC/Makefile index 54389988050..a990cf72e76 100644 --- a/Examples/MAX78002/USB/MAXUSB/USB_CompositeDevice_MSC_CDC/Makefile +++ b/Examples/MAX78002/USB/MAXUSB/USB_CompositeDevice_MSC_CDC/Makefile @@ -100,7 +100,7 @@ $(info Loaded project.mk) ifeq "$(MAXIM_PATH)" "" # MAXIM_PATH is still not defined... -DEPTH := ../../../../ +DEPTH := ../../../../../ MAXIM_PATH := $(abspath $(DEPTH)) $(warning Warning: MAXIM_PATH is not set! Set MAXIM_PATH in your environment or in project.mk to clear this warning.) $(warning Warning: Attempting to use $(MAXIM_PATH) calculated from relative path) diff --git a/Examples/MAX78002/USB/MAXUSB/USB_CompositeDevice_MSC_HID/Makefile b/Examples/MAX78002/USB/MAXUSB/USB_CompositeDevice_MSC_HID/Makefile index cc1c7613746..4ad070a549d 100644 --- a/Examples/MAX78002/USB/MAXUSB/USB_CompositeDevice_MSC_HID/Makefile +++ b/Examples/MAX78002/USB/MAXUSB/USB_CompositeDevice_MSC_HID/Makefile @@ -100,7 +100,7 @@ $(info Loaded project.mk) ifeq "$(MAXIM_PATH)" "" # MAXIM_PATH is still not defined... -DEPTH := ../../../../ +DEPTH := ../../../../../ MAXIM_PATH := $(abspath $(DEPTH)) $(warning Warning: MAXIM_PATH is not set! Set MAXIM_PATH in your environment or in project.mk to clear this warning.) $(warning Warning: Attempting to use $(MAXIM_PATH) calculated from relative path) diff --git a/Examples/MAX78002/USB/MAXUSB/USB_HIDKeyboard/Makefile b/Examples/MAX78002/USB/MAXUSB/USB_HIDKeyboard/Makefile index cc1c7613746..4ad070a549d 100644 --- a/Examples/MAX78002/USB/MAXUSB/USB_HIDKeyboard/Makefile +++ b/Examples/MAX78002/USB/MAXUSB/USB_HIDKeyboard/Makefile @@ -100,7 +100,7 @@ $(info Loaded project.mk) ifeq "$(MAXIM_PATH)" "" # MAXIM_PATH is still not defined... -DEPTH := ../../../../ +DEPTH := ../../../../../ MAXIM_PATH := $(abspath $(DEPTH)) $(warning Warning: MAXIM_PATH is not set! Set MAXIM_PATH in your environment or in project.mk to clear this warning.) $(warning Warning: Attempting to use $(MAXIM_PATH) calculated from relative path) diff --git a/Examples/MAX78002/USB/MAXUSB/USB_MassStorage/Makefile b/Examples/MAX78002/USB/MAXUSB/USB_MassStorage/Makefile index cc1c7613746..4ad070a549d 100644 --- a/Examples/MAX78002/USB/MAXUSB/USB_MassStorage/Makefile +++ b/Examples/MAX78002/USB/MAXUSB/USB_MassStorage/Makefile @@ -100,7 +100,7 @@ $(info Loaded project.mk) ifeq "$(MAXIM_PATH)" "" # MAXIM_PATH is still not defined... -DEPTH := ../../../../ +DEPTH := ../../../../../ MAXIM_PATH := $(abspath $(DEPTH)) $(warning Warning: MAXIM_PATH is not set! Set MAXIM_PATH in your environment or in project.mk to clear this warning.) $(warning Warning: Attempting to use $(MAXIM_PATH) calculated from relative path) diff --git a/Examples/MAX78002/USB/MAXUSB/USB_MassStorage_ThroughPut/Makefile b/Examples/MAX78002/USB/MAXUSB/USB_MassStorage_ThroughPut/Makefile index cc1c7613746..4ad070a549d 100644 --- a/Examples/MAX78002/USB/MAXUSB/USB_MassStorage_ThroughPut/Makefile +++ b/Examples/MAX78002/USB/MAXUSB/USB_MassStorage_ThroughPut/Makefile @@ -100,7 +100,7 @@ $(info Loaded project.mk) ifeq "$(MAXIM_PATH)" "" # MAXIM_PATH is still not defined... -DEPTH := ../../../../ +DEPTH := ../../../../../ MAXIM_PATH := $(abspath $(DEPTH)) $(warning Warning: MAXIM_PATH is not set! Set MAXIM_PATH in your environment or in project.mk to clear this warning.) $(warning Warning: Attempting to use $(MAXIM_PATH) calculated from relative path) diff --git a/Examples/MAX78002/USB/TinyUSB/cdc_msc/Makefile b/Examples/MAX78002/USB/TinyUSB/cdc_msc/Makefile index 54389988050..a990cf72e76 100644 --- a/Examples/MAX78002/USB/TinyUSB/cdc_msc/Makefile +++ b/Examples/MAX78002/USB/TinyUSB/cdc_msc/Makefile @@ -100,7 +100,7 @@ $(info Loaded project.mk) ifeq "$(MAXIM_PATH)" "" # MAXIM_PATH is still not defined... -DEPTH := ../../../../ +DEPTH := ../../../../../ MAXIM_PATH := $(abspath $(DEPTH)) $(warning Warning: MAXIM_PATH is not set! Set MAXIM_PATH in your environment or in project.mk to clear this warning.) $(warning Warning: Attempting to use $(MAXIM_PATH) calculated from relative path) diff --git a/Examples/MAX78002/USB/TinyUSB/cdc_msc_freertos/Makefile b/Examples/MAX78002/USB/TinyUSB/cdc_msc_freertos/Makefile index 54389988050..a990cf72e76 100644 --- a/Examples/MAX78002/USB/TinyUSB/cdc_msc_freertos/Makefile +++ b/Examples/MAX78002/USB/TinyUSB/cdc_msc_freertos/Makefile @@ -100,7 +100,7 @@ $(info Loaded project.mk) ifeq "$(MAXIM_PATH)" "" # MAXIM_PATH is still not defined... -DEPTH := ../../../../ +DEPTH := ../../../../../ MAXIM_PATH := $(abspath $(DEPTH)) $(warning Warning: MAXIM_PATH is not set! Set MAXIM_PATH in your environment or in project.mk to clear this warning.) $(warning Warning: Attempting to use $(MAXIM_PATH) calculated from relative path) diff --git a/Examples/MAX78002/USB/TinyUSB/hid_composite/Makefile b/Examples/MAX78002/USB/TinyUSB/hid_composite/Makefile index 54389988050..a990cf72e76 100644 --- a/Examples/MAX78002/USB/TinyUSB/hid_composite/Makefile +++ b/Examples/MAX78002/USB/TinyUSB/hid_composite/Makefile @@ -100,7 +100,7 @@ $(info Loaded project.mk) ifeq "$(MAXIM_PATH)" "" # MAXIM_PATH is still not defined... -DEPTH := ../../../../ +DEPTH := ../../../../../ MAXIM_PATH := $(abspath $(DEPTH)) $(warning Warning: MAXIM_PATH is not set! Set MAXIM_PATH in your environment or in project.mk to clear this warning.) $(warning Warning: Attempting to use $(MAXIM_PATH) calculated from relative path) diff --git a/Examples/MAX78002/USB/TinyUSB/msc_dual_lun/Makefile b/Examples/MAX78002/USB/TinyUSB/msc_dual_lun/Makefile index 54389988050..a990cf72e76 100644 --- a/Examples/MAX78002/USB/TinyUSB/msc_dual_lun/Makefile +++ b/Examples/MAX78002/USB/TinyUSB/msc_dual_lun/Makefile @@ -100,7 +100,7 @@ $(info Loaded project.mk) ifeq "$(MAXIM_PATH)" "" # MAXIM_PATH is still not defined... -DEPTH := ../../../../ +DEPTH := ../../../../../ MAXIM_PATH := $(abspath $(DEPTH)) $(warning Warning: MAXIM_PATH is not set! Set MAXIM_PATH in your environment or in project.mk to clear this warning.) $(warning Warning: Attempting to use $(MAXIM_PATH) calculated from relative path) diff --git a/Libraries/CMSIS/Device/Maxim/GCC/mxc_version.mk b/Libraries/CMSIS/Device/Maxim/GCC/mxc_version.mk deleted file mode 100644 index bd0ef8389cf..00000000000 --- a/Libraries/CMSIS/Device/Maxim/GCC/mxc_version.mk +++ /dev/null @@ -1,24 +0,0 @@ -############################################################################### - # - # Copyright (C) 2024 Analog Devices, Inc. - # - # Licensed under the Apache License, Version 2.0 (the "License"); - # you may not use this file except in compliance with the License. - # You may obtain a copy of the License at - # - # http://www.apache.org/licenses/LICENSE-2.0 - # - # Unless required by applicable law or agreed to in writing, software - # distributed under the License is distributed on an "AS IS" BASIS, - # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - # See the License for the specific language governing permissions and - # limitations under the License. - # - ############################################################################## -# Autogenerated version info for build system. -MSDK_VERSION_STRING := v2023_10-333-ga03f3f8b2f8 -MSDK_VERSION_YEAR := 2023 -MSDK_VERSION_MONTH := 10 - -# Add root MAXIM_PATH to IPATH so compiler can locate msdk_version.h -IPATH += $(MAXIM_PATH)