Fix MSBL binary mismatch

analogdevicesinc · Oct 11, 2023 · 5cc924c · 5cc924c
1 parent 6c5e2f1
commit 5cc924c
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 3 deletions.
diff --git a/maxrefdes178-VCAudioPlayback/maxrefdes178_max32666/Makefile b/maxrefdes178-VCAudioPlayback/maxrefdes178_max32666/Makefile
@@ -112,6 +112,18 @@ PROJ_CFLAGS+=-DMXC_ASSERT_ENABLE
 PROJ_CFLAGS+=-Wall
 #PROJ_CFLAGS+=-Werror
 
+ifeq ($(OS),Windows_NT)
+MSBLGEN=msblGenWin32.exe
+else
+UNAME_S := $(shell uname -s)
+ifeq ($(UNAME_S),Linux)
+MSBLGEN=msblGenLinux
+endif
+ifeq ($(UNAME_S),Darwin)
+MSBLGEN=msblGenOSX
+endif
+endif
+
 # Specify the target revision to override default
 # "A2" in ASCII
 # TARGET_REV=0x4132
@@ -194,7 +206,7 @@ distclean: clean libclean
 
 all:
 	arm-none-eabi-objcopy $(BUILD_DIR)/$(PROJECT).elf -R .sig -O binary $(BUILD_DIR)/$(PROJECT)_app.bin
-	cd $(BUILD_DIR) && $(CURDIR)/../../external/msblGenWin32.exe $(BUILD_DIR)/$(PROJECT)_app.bin MAX32666 8192
+	cd $(BUILD_DIR) && $(CURDIR)/../../external/${MSBLGEN} $(BUILD_DIR)/$(PROJECT)_app.bin MAX32666 8192
 	cat $(CURDIR)/../../maxrefdes178-AppSwitcher/maxrefdes178_max32666_bootloader.bin $(BUILD_DIR)/$(PROJECT)_app.bin > $(BUILD_DIR)/$(PROJECT).bin
 
 sla: all

diff --git a/maxrefdes178-VCAudioPlayback/maxrefdes178_max78000_audio/Makefile b/maxrefdes178-VCAudioPlayback/maxrefdes178_max78000_audio/Makefile
@@ -99,6 +99,18 @@ PROJ_CFLAGS+=-DMAXREFDES178_MAX78000_AUDIO
 PROJ_CFLAGS+=-Wall
 #PROJ_CFLAGS+=-Werror
 
+ifeq ($(OS),Windows_NT)
+MSBLGEN=msblGenWin32.exe
+else
+UNAME_S := $(shell uname -s)
+ifeq ($(UNAME_S),Linux)
+MSBLGEN=msblGenLinux
+endif
+ifeq ($(UNAME_S),Darwin)
+MSBLGEN=msblGenOSX
+endif
+endif
+
 # Specify the target revision to override default
 # "A2" in ASCII
 # TARGET_REV=0x4132
@@ -137,7 +149,7 @@ include $(CMSIS_ROOT)/Device/Maxim/$(TARGET_UC)/Source/$(COMPILER)/$(TARGET_LC).
 
 all:
 	arm-none-eabi-objcopy $(BUILD_DIR)/$(PROJECT).elf -R .sig -O binary $(BUILD_DIR)/$(PROJECT)_app.bin
-	cd $(BUILD_DIR) && $(CURDIR)/../../external/msblGenWin32.exe $(BUILD_DIR)/$(PROJECT)_app.bin MAX78000 8192
+	cd $(BUILD_DIR) && $(CURDIR)/../../external/${MSBLGEN} $(BUILD_DIR)/$(PROJECT)_app.bin MAX78000 8192
 	cat $(CURDIR)/../../maxrefdes178-AppSwitcher/maxrefdes178_max78000_bootloader.bin $(BUILD_DIR)/$(PROJECT)_app.bin > $(BUILD_DIR)/$(PROJECT).bin
 # 	$(CA_SIGN_BUILD) $(BUILD_DIR)/$(PROJECT).bin $(TEST_KEY)
 # 	arm-none-eabi-objcopy  $(BUILD_DIR)/$(PROJECT).elf --update-section .sig=$(BUILD_DIR)/$(PROJECT).bin.sig

diff --git a/maxrefdes178-VCAudioPlayback/maxrefdes178_max78000_video/Makefile b/maxrefdes178-VCAudioPlayback/maxrefdes178_max78000_video/Makefile
@@ -86,6 +86,18 @@ PROJ_CFLAGS+=-DMAXREFDES178_MAX78000_VIDEO
 PROJ_CFLAGS+=-Wall
 #PROJ_CFLAGS+=-Werror
 
+ifeq ($(OS),Windows_NT)
+MSBLGEN=msblGenWin32.exe
+else
+UNAME_S := $(shell uname -s)
+ifeq ($(UNAME_S),Linux)
+MSBLGEN=msblGenLinux
+endif
+ifeq ($(UNAME_S),Darwin)
+MSBLGEN=msblGenOSX
+endif
+endif
+
 # Specify the target revision to override default
 # "A2" in ASCII
 # TARGET_REV=0x4132
@@ -124,7 +136,7 @@ include $(CMSIS_ROOT)/Device/Maxim/$(TARGET_UC)/Source/$(COMPILER)/$(TARGET_LC).
 
 all:
 	arm-none-eabi-objcopy $(BUILD_DIR)/$(PROJECT).elf -R .sig -O binary $(BUILD_DIR)/$(PROJECT)_app.bin
-	cd $(BUILD_DIR) && $(CURDIR)/../../external/msblGenWin32.exe $(BUILD_DIR)/$(PROJECT)_app.bin MAX78000 8192
+	cd $(BUILD_DIR) && $(CURDIR)/../../external/${MSBLGEN} $(BUILD_DIR)/$(PROJECT)_app.bin MAX78000 8192
 	cat $(CURDIR)/../../maxrefdes178-AppSwitcher/maxrefdes178_max78000_bootloader.bin $(BUILD_DIR)/$(PROJECT)_app.bin > $(BUILD_DIR)/$(PROJECT).bin
 # 	$(CA_SIGN_BUILD) $(BUILD_DIR)/$(PROJECT).bin $(TEST_KEY)
 # 	arm-none-eabi-objcopy  $(BUILD_DIR)/$(PROJECT).elf --update-section .sig=$(BUILD_DIR)/$(PROJECT).bin.sig