Skip to content

Commit

Permalink
updated makefile to use correct depth when maxim path not set
Browse files Browse the repository at this point in the history
  • Loading branch information
Eric-Busch0 committed Jan 9, 2025
1 parent 8abf4d2 commit e48da27
Show file tree
Hide file tree
Showing 12 changed files with 12 additions and 13 deletions.
1 change: 1 addition & 0 deletions Examples/MAX32690/USB/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
build
2 changes: 1 addition & 1 deletion Examples/MAX32690/USB/MAXUSB/USB_CDCACM/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion Examples/MAX32690/USB/MAXUSB/USB_HIDKeyboard/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion Examples/MAX32690/USB/MAXUSB/USB_MassStorage/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion Examples/MAX32690/USB/TinyUSB/cdc_msc/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion Examples/MAX32690/USB/TinyUSB/cdc_msc_freertos/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion Examples/MAX32690/USB/TinyUSB/hid_composite/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion Examples/MAX32690/USB/TinyUSB/msc_dual_lun/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion Examples/MAX32690/USB/TinyUSB/msc_ext_flash/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 1 addition & 3 deletions Examples/MAX32690/USB/TinyUSB/msc_ext_flash/msc_ext_flash.c
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ 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();
Expand All @@ -231,8 +231,6 @@ void spixf_disk_init()
Ext_Flash_Quad(0);
}

id = Ext_Flash_ID();

is_initialized = true;
}
}
Expand Down

0 comments on commit e48da27

Please sign in to comment.