From 43a3fa00fcb840f0fc87c3ef0064400243958a04 Mon Sep 17 00:00:00 2001
From: per1234 <accounts@perglass.com>
Date: Fri, 22 Mar 2024 07:53:53 -0700
Subject: [PATCH] Add missing folder name suffix in bootloader paths

The paths of the non-autobaud bootloader binaries include an upload baud rate folder. These folder names have a "_baud"
suffix.

Previously, the `bootloader.file` properties for these bootloaders only had the integer component in the path. This
caused the "Burn Bootloader" operation to fail when configured to use a non-autobaud bootloader:

> avrdude ioerror() OS error: file ~/Library/Arduino15/packages/MegaCore/hardware/avr/3.0.1/bootloaders/urboot/atmega2560/watchdog_1_s/external_oscillator/16000000_hz/115200/uart3_rxj0_txj1/led+b7/urboot_atmega2560_pr_ee_ce.hex is not readable: No such file or directory
---
 avr/boards.txt | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/avr/boards.txt b/avr/boards.txt
index 45b88cdd8..a38ffd568 100644
--- a/avr/boards.txt
+++ b/avr/boards.txt
@@ -259,14 +259,14 @@ menu.baudrate=Baud rate
 2560.menu.bootloader.uart2.upload.protocol=urclock
 2560.menu.bootloader.uart2.upload.uartpins=uart2_rxh0_txh1
 2560.menu.bootloader.uart2.build.export_merged_output=true
-2560.menu.bootloader.uart2.bootloader.file=urboot/{build.mcu}/watchdog_1_s/{build.oscillator}/{build.clock_speed}/{upload.speed}/{upload.uartpins}/{build.bootloader_led}/urboot_{build.mcu}_pr_ee_ce.hex
+2560.menu.bootloader.uart2.bootloader.file=urboot/{build.mcu}/watchdog_1_s/{build.oscillator}/{build.clock_speed}/{upload.speed}_baud/{upload.uartpins}/{build.bootloader_led}/urboot_{build.mcu}_pr_ee_ce.hex
 
 2560.menu.bootloader.uart3=Yes (UART3)
 2560.menu.bootloader.uart3.upload.maximum_size=261632
 2560.menu.bootloader.uart3.upload.protocol=urclock
 2560.menu.bootloader.uart3.upload.uartpins=uart3_rxj0_txj1
 2560.menu.bootloader.uart3.build.export_merged_output=true
-2560.menu.bootloader.uart3.bootloader.file=urboot/{build.mcu}/watchdog_1_s/{build.oscillator}/{build.clock_speed}/{upload.speed}/{upload.uartpins}/{build.bootloader_led}/urboot_{build.mcu}_pr_ee_ce.hex
+2560.menu.bootloader.uart3.bootloader.file=urboot/{build.mcu}/watchdog_1_s/{build.oscillator}/{build.clock_speed}/{upload.speed}_baud/{upload.uartpins}/{build.bootloader_led}/urboot_{build.mcu}_pr_ee_ce.hex
 
 2560.menu.bootloader.no_bootloader=No bootloader
 2560.menu.bootloader.no_bootloader.upload.maximum_size=262144
@@ -727,14 +727,14 @@ menu.baudrate=Baud rate
 1280.menu.bootloader.uart2.upload.protocol=urclock
 1280.menu.bootloader.uart2.upload.uartpins=uart2_rxh0_txh1
 1280.menu.bootloader.uart2.build.export_merged_output=true
-1280.menu.bootloader.uart2.bootloader.file=urboot/{build.mcu}/watchdog_1_s/{build.oscillator}/{build.clock_speed}/{upload.speed}/{upload.uartpins}/{build.bootloader_led}/urboot_{build.mcu}_pr_ee_ce.hex
+1280.menu.bootloader.uart2.bootloader.file=urboot/{build.mcu}/watchdog_1_s/{build.oscillator}/{build.clock_speed}/{upload.speed}_baud/{upload.uartpins}/{build.bootloader_led}/urboot_{build.mcu}_pr_ee_ce.hex
 
 1280.menu.bootloader.uart3=Yes (UART3)
 1280.menu.bootloader.uart3.upload.maximum_size=130560
 1280.menu.bootloader.uart3.upload.protocol=urclock
 1280.menu.bootloader.uart3.upload.uartpins=uart3_rxj0_txj1
 1280.menu.bootloader.uart3.build.export_merged_output=true
-1280.menu.bootloader.uart3.bootloader.file=urboot/{build.mcu}/watchdog_1_s/{build.oscillator}/{build.clock_speed}/{upload.speed}/{upload.uartpins}/{build.bootloader_led}/urboot_{build.mcu}_pr_ee_ce.hex
+1280.menu.bootloader.uart3.bootloader.file=urboot/{build.mcu}/watchdog_1_s/{build.oscillator}/{build.clock_speed}/{upload.speed}_baud/{upload.uartpins}/{build.bootloader_led}/urboot_{build.mcu}_pr_ee_ce.hex
 
 1280.menu.bootloader.no_bootloader=No bootloader
 1280.menu.bootloader.no_bootloader.upload.maximum_size=131072
@@ -1430,14 +1430,14 @@ menu.baudrate=Baud rate
 640.menu.bootloader.uart2.upload.protocol=urclock
 640.menu.bootloader.uart2.upload.uartpins=uart2_rxh0_txh1
 640.menu.bootloader.uart2.build.export_merged_output=true
-640.menu.bootloader.uart2.bootloader.file=urboot/{build.mcu}/watchdog_1_s/{build.oscillator}/{build.clock_speed}/{upload.speed}/{upload.uartpins}/{build.bootloader_led}/urboot_{build.mcu}_pr_ee_ce.hex
+640.menu.bootloader.uart2.bootloader.file=urboot/{build.mcu}/watchdog_1_s/{build.oscillator}/{build.clock_speed}/{upload.speed}_baud/{upload.uartpins}/{build.bootloader_led}/urboot_{build.mcu}_pr_ee_ce.hex
 
 640.menu.bootloader.uart3=Yes (UART3)
 640.menu.bootloader.uart3.upload.maximum_size=65024
 640.menu.bootloader.uart3.upload.protocol=urclock
 640.menu.bootloader.uart3.upload.uartpins=uart3_rxj0_txj1
 640.menu.bootloader.uart3.build.export_merged_output=true
-640.menu.bootloader.uart3.bootloader.file=urboot/{build.mcu}/watchdog_1_s/{build.oscillator}/{build.clock_speed}/{upload.speed}/{upload.uartpins}/{build.bootloader_led}/urboot_{build.mcu}_pr_ee_ce.hex
+640.menu.bootloader.uart3.bootloader.file=urboot/{build.mcu}/watchdog_1_s/{build.oscillator}/{build.clock_speed}/{upload.speed}_baud/{upload.uartpins}/{build.bootloader_led}/urboot_{build.mcu}_pr_ee_ce.hex
 
 640.menu.bootloader.no_bootloader=No bootloader
 640.menu.bootloader.no_bootloader.upload.maximum_size=65536