summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2020-04-17 17:50:58 +1000
committerFlorian Didron <fdidron@users.noreply.github.com>2020-06-12 17:00:27 +0900
commit4c72911ad9fd98d6f1d6a2abe73016b1c407b1ac (patch)
treec2770f49183c23d7d1f4105427de07d4c7676a87
parent2c719dbb71cba53dcb32cdd47be152e18c42756a (diff)
Remove Atmel FLIP from install scripts and documentation (#8822)
-rw-r--r--tmk_core/avr.mk14
-rw-r--r--tmk_core/rules.mk2
-rwxr-xr-xutil/activate_msys2.sh1
-rwxr-xr-xutil/activate_wsl.sh1
-rwxr-xr-xutil/msys2_install.sh14
-rwxr-xr-xutil/win_shared_install.sh4
-rwxr-xr-xutil/wsl_install.sh15
7 files changed, 2 insertions, 49 deletions
diff --git a/tmk_core/avr.mk b/tmk_core/avr.mk
index 9a619f89b3..12aa709a24 100644
--- a/tmk_core/avr.mk
+++ b/tmk_core/avr.mk
@@ -105,13 +105,6 @@ endef
teensy: $(BUILD_DIR)/$(TARGET).hex check-size cpfirmware
$(call EXEC_TEENSY)
-BATCHISP ?= batchisp
-
-flip: $(BUILD_DIR)/$(TARGET).hex check-size
- $(BATCHISP) -hardware usb -device $(MCU) -operation erase f
- $(BATCHISP) -hardware usb -device $(MCU) -operation loadbuffer $(BUILD_DIR)/$(TARGET).hex program
- $(BATCHISP) -hardware usb -device $(MCU) -operation start reset 0
-
DFU_PROGRAMMER ?= dfu-programmer
GREP ?= grep
@@ -146,13 +139,6 @@ dfu-start:
$(DFU_PROGRAMMER) $(MCU) reset
$(DFU_PROGRAMMER) $(MCU) start
-flip-ee: $(BUILD_DIR)/$(TARGET).hex $(BUILD_DIR)/$(TARGET).eep
- $(COPY) $(BUILD_DIR)/$(TARGET).eep $(BUILD_DIR)/$(TARGET)eep.hex
- $(BATCHISP) -hardware usb -device $(MCU) -operation memory EEPROM erase
- $(BATCHISP) -hardware usb -device $(MCU) -operation memory EEPROM loadbuffer $(BUILD_DIR)/$(TARGET)eep.hex program
- $(BATCHISP) -hardware usb -device $(MCU) -operation start reset 0
- $(REMOVE) $(BUILD_DIR)/$(TARGET)eep.hex
-
dfu-ee: $(BUILD_DIR)/$(TARGET).hex $(BUILD_DIR)/$(TARGET).eep
if $(DFU_PROGRAMMER) --version 2>&1 | $(GREP) -q 0.7 ; then\
$(DFU_PROGRAMMER) $(MCU) flash --eeprom $(BUILD_DIR)/$(TARGET).eep;\
diff --git a/tmk_core/rules.mk b/tmk_core/rules.mk
index a66718cd2a..f45fd37929 100644
--- a/tmk_core/rules.mk
+++ b/tmk_core/rules.mk
@@ -439,7 +439,7 @@ $(eval $(foreach OUTPUT,$(OUTPUTS),$(shell mkdir -p $(OUTPUT) 2>/dev/null)))
.PHONY : all finish sizebefore sizeafter qmkversion \
gccversion build elf hex eep lss sym coff extcoff \
clean clean_list debug gdb-config show_path \
-program teensy dfu flip dfu-ee flip-ee dfu-start \
+program teensy dfu dfu-ee dfu-start \
flash dfu-split-left dfu-split-right \
avrdude-split-left avrdude-split-right \
avrdude-loop usbasp
diff --git a/util/activate_msys2.sh b/util/activate_msys2.sh
index 07888ffe12..8741cc6b06 100755
--- a/util/activate_msys2.sh
+++ b/util/activate_msys2.sh
@@ -6,7 +6,6 @@ function export_variables {
export PATH=$PATH:$util_dir/dfu-programmer
export PATH=$PATH:$util_dir/dfu-util-0.9-win64
export PATH=$PATH:$util_dir/bootloadHID.2012-12-08/commandline
- export PATH=$PATH:$util_dir/flip/bin
export PATH=$PATH:$util_dir/avr8-gnu-toolchain/bin
export PATH=$PATH:$util_dir/gcc-arm-none-eabi/bin
}
diff --git a/util/activate_wsl.sh b/util/activate_wsl.sh
index 78bbf9ccbf..26a47187a9 100755
--- a/util/activate_wsl.sh
+++ b/util/activate_wsl.sh
@@ -8,7 +8,6 @@ function export_variables {
export DFU_UTIL=$download_dir/dfu-util-0.9-win64/dfu-util.exe
export TEENSY_LOADER_CLI=$download_dir/teensy_loader_cli.exe
export BOOTLOADHID_PROGRAMMER=$download_dir/bootloadHID.2012-12-08/commandline/bootloadHID.exe
- export BATCHISP=batchisp.exe
}
export_variables
diff --git a/util/msys2_install.sh b/util/msys2_install.sh
index 001f55dc48..55df9c007b 100755
--- a/util/msys2_install.sh
+++ b/util/msys2_install.sh
@@ -4,11 +4,10 @@ dir=$(cd -P -- "$(dirname -- "$0")" && pwd -P)
download_dir=~/qmk_utils
avrtools=avr8-gnu-toolchain
armtools=gcc-arm-none-eabi
-installflip=false
util_dir=$(dirname "$0")
echo "Installing dependencies needed for the installation (quazip)"
-pacman --needed --noconfirm --disable-download-timeout -Sy base-devel mingw-w64-x86_64-toolchain mingw-w64-x86_64-clang msys/git msys/p7zip mingw-w64-x86_64-python3-pip msys/unzip
+pacman --needed --noconfirm --disable-download-timeout -Sy base-devel mingw-w64-x86_64-toolchain mingw-w64-x86_64-clang git mingw-w64-x86_64-python3-pip unzip
source "$dir/win_shared_install.sh"
@@ -31,19 +30,8 @@ function install_arm {
rm gcc-arm-none-eabi-8-2019-q3-update-win32.zip
}
-function extract_flip {
- rm -f -r flip
- 7z -oflip x FlipInstaller.exe
-}
-
pushd "$download_dir"
-if [ -f "FlipInstaller.exe" ]; then
- echo
- echo "Extracting flip"
- extract_flip
-fi
-
if [ ! -d "$avrtools" ]; then
echo
echo "The AVR toolchain is not installed."
diff --git a/util/win_shared_install.sh b/util/win_shared_install.sh
index 1265cb027f..072ca47c81 100755
--- a/util/win_shared_install.sh
+++ b/util/win_shared_install.sh
@@ -22,10 +22,6 @@ function install_utils {
wget 'https://www.obdev.at/downloads/vusb/bootloadHID.2012-12-08.zip'
unzip bootloadHID.2012-12-08.zip
- echo "Installing Atmel Flip"
- wget 'http://ww1.microchip.com/downloads/en/DeviceDoc/Flip%20Installer%20-%203.4.7.112.exe'
- mv Flip\ Installer\ \-\ 3.4.7.112.exe FlipInstaller.exe
-
echo "Downloading the QMK driver installer"
wget -qO- https://api.github.com/repos/qmk/qmk_driver_installer/releases | grep browser_download_url | head -n 1 | cut -d '"' -f 4 | wget -i -
diff --git a/util/wsl_install.sh b/util/wsl_install.sh
index 197d9f089e..8ed177ca3e 100755
--- a/util/wsl_install.sh
+++ b/util/wsl_install.sh
@@ -31,21 +31,6 @@ source "$dir/win_shared_install.sh"
pip3 install -r ${util_dir}/../requirements.txt
-pushd "$download_dir"
-while true; do
- echo
- echo "Flip need to be installed if you want to use that for programming."
- echo "Please install it to the default location!"
- read -p "Do you want to install it now? (Y/N) " res
- case $res in
- [Yy]* ) cmd.exe /c FlipInstaller.exe; break;;
- [Nn]* ) break;;
- * ) echo "Invalid answer";;
- esac
-done
-popd
-
-
echo
echo "Creating a softlink to the utils directory as ~/qmk_utils."
echo "This is needed so that the the make system can find all utils it need."