From 37a88797f59f233a1855985fc1895ad5110dc528 Mon Sep 17 00:00:00 2001 From: Jesse Vincent Date: Fri, 23 Oct 2020 01:33:19 -0700 Subject: [PATCH] switch find-bootloader-path over to using arduino prefs, killing our last internal use of BOARD_HARDWARE_PATH --- bin/kaleidoscope-builder | 4 +--- etc/kaleidoscope-builder.conf | 7 ------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/bin/kaleidoscope-builder b/bin/kaleidoscope-builder index b46d0d14..663e9502 100755 --- a/bin/kaleidoscope-builder +++ b/bin/kaleidoscope-builder @@ -378,9 +378,7 @@ flash_with_programmer() { } find_bootloader_path() { - BOOTLOADER_FILE=$( get_arduino_pref 'bootloader.file' ) - : "${BOOTLOADER_FILE:=caterina/Caterina.hex}" - : "${BOOTLOADER_PATH:=${BOARD_HARDWARE_PATH}/keyboardio/avr/bootloaders/${BOOTLOADER_FILE}}" + : "${BOOTLOADER_PATH:=$( get_arduino_pref 'runtime.platform.path' )/bootloaders/$( get_arduino_pref 'bootloader.file' )}" } diff --git a/etc/kaleidoscope-builder.conf b/etc/kaleidoscope-builder.conf index 17249ace..c471a517 100644 --- a/etc/kaleidoscope-builder.conf +++ b/etc/kaleidoscope-builder.conf @@ -202,10 +202,3 @@ COMPILER_PREFIX="${COMPILER_PREFIX-avr-}" : "${AVRDUDE:=${ARDUINO_TOOLS_PATH}/avr/bin/avrdude}" : "${AVRDUDE_CONF:=${ARDUINO_TOOLS_PATH}/avr/etc/avrdude.conf}" - -###### -###### Source files and dependencies -###### - -: "${BOARD_HARDWARE_PATH:=${ARDUINO_LOCAL_LIB_PATH}/hardware}" -