Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bootloader: Cleanup code, reduce duplication #69

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

bootloader: Cleanup code, reduce duplication #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0f9301c
bootloader: Cleanup code, reduce duplication
kallisti5 Sep 25, 2017
d832974
bootloader: Bump versions after the major v6.2+ bugfix
kallisti5 Sep 25, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
754 changes: 0 additions & 754 deletions Bootloaders/BPv3-bootloader/pirate-loader/pirate-loader.c
View file
Open in desktop

This file was deleted.

0 Bootloaders/BPv3-bootloader/COPYING.txt → Bootloaders/BPv3/COPYING.txt
View file
Open in desktop
File renamed without changes.
0 ...-bootloader/firmware-v4.1/src/devices.inc → Bootloaders/BPv3/devices.inc
View file
Open in desktop
File renamed without changes.
0 ...oader/firmware-v4.5/ds30loader.X/Makefile → Bootloaders/BPv3/ds30loader.X/Makefile
View file
Open in desktop
File renamed without changes.
0 ...ds30loader.X/nbproject/configurations.xml → ...ds30loader.X/nbproject/configurations.xml
View file
Open in desktop
File renamed without changes.
0 ...e-v4.5/ds30loader.X/nbproject/project.xml → ...s/BPv3/ds30loader.X/nbproject/project.xml
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...Pv3-bootloader/firmware-v4.5/ds30loader.s → Bootloaders/BPv3/ds30loader.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@
; .equ STARTADDR, ( FLASHSIZE - 2*(PAGESIZE * 2) ) /*place bootloader in 2nd last program page*/
.equ STARTADDR, ( FLASHSIZE - (2* (PAGESIZE)) ) /*place bootloader in last program page*/
.equ BLCHECKST, ( STARTADDR - (ROWSIZE) ) /*precalculate the first row write position that would overwrite the bootloader*/
.equ BLVERSION, 0x0405 ;bootloader version for Bus Pirate firmware (located at last instruction before flash config words)
.equ BLVERSION, 0x0406 ;bootloader version for Bus Pirate firmware (located at last instruction before flash config words)
;------------------------------------------------------------------------------
; Validate user settings
;------------------------------------------------------------------------------
Expand Down
0 ...v3-bootloader/ds30_Loader_GUI/GHelper.dll → ...ders/BPv3/old/ds30_Loader_GUI/GHelper.dll
View file
Open in desktop
File renamed without changes.
0 ...oader/ds30_Loader_GUI/ds30 Loader GUI.exe → ...3/old/ds30_Loader_GUI/ds30 Loader GUI.exe
View file
Open in desktop
File renamed without changes.
0 ...ootloader/ds30_Loader_GUI/ds30 Loader.dll → .../BPv3/old/ds30_Loader_GUI/ds30 Loader.dll
View file
Open in desktop
File renamed without changes.
0 ...3-bootloader/ds30_Loader_GUI/settings.xml → ...ers/BPv3/old/ds30_Loader_GUI/settings.xml
View file
Open in desktop
File renamed without changes.
0 ...3-bootloader/firmware-v4.1/ds30loader.mcp → ...ers/BPv3/old/firmware-v4.1/ds30loader.mcp
View file
Open in desktop
File renamed without changes.
0 ...3-bootloader/firmware-v4.1/ds30loader.mcs → ...ers/BPv3/old/firmware-v4.1/ds30loader.mcs
View file
Open in desktop
File renamed without changes.
0 ...3-bootloader/firmware-v4.1/ds30loader.mcw → ...ers/BPv3/old/firmware-v4.1/ds30loader.mcw
View file
Open in desktop
File renamed without changes.
0 ...-bootloader/firmware-v4.3/src/devices.inc → ...rs/BPv3/old/firmware-v4.1/src/devices.inc
View file
Open in desktop
File renamed without changes.
0 ...bootloader/firmware-v4.1/src/ds30loader.s → ...s/BPv3/old/firmware-v4.1/src/ds30loader.s
View file
Open in desktop
File renamed without changes.
0 ...bootloader/firmware-v4.1/src/settings.inc → ...s/BPv3/old/firmware-v4.1/src/settings.inc
View file
Open in desktop
File renamed without changes.
0 ...3-bootloader/firmware-v4.3/ds30loader.mcp → ...ers/BPv3/old/firmware-v4.3/ds30loader.mcp
View file
Open in desktop
File renamed without changes.
0 ...3-bootloader/firmware-v4.3/ds30loader.mcs → ...ers/BPv3/old/firmware-v4.3/ds30loader.mcs
View file
Open in desktop
File renamed without changes.
0 ...3-bootloader/firmware-v4.3/ds30loader.mcw → ...ers/BPv3/old/firmware-v4.3/ds30loader.mcw
View file
Open in desktop
File renamed without changes.
0 ...BPv3-bootloader/firmware-v4.5/devices.inc → ...rs/BPv3/old/firmware-v4.3/src/devices.inc
View file
Open in desktop
File renamed without changes.
0 ...bootloader/firmware-v4.3/src/ds30loader.s → ...s/BPv3/old/firmware-v4.3/src/ds30loader.s
View file
Open in desktop
File renamed without changes.
0 ...bootloader/firmware-v4.3/src/settings.inc → ...s/BPv3/old/firmware-v4.3/src/settings.inc
View file
Open in desktop
File renamed without changes.
0 Bootloaders/BPv3-bootloader/hex2prog.html → Bootloaders/BPv3/old/hex2prog.html
View file
Open in desktop
File renamed without changes.
0 ...oader/upgrader-v2tov4/APP 24FJ64GA002.gld → ...3/old/upgrader-v2tov4/APP 24FJ64GA002.gld
View file
Open in desktop
File renamed without changes.
0 ...upgrader-v2tov4/BPv3-blv4updater-v0.2.hex → ...upgrader-v2tov4/BPv3-blv4updater-v0.2.hex
View file
Open in desktop
File renamed without changes.
0 ...BPv3-bootloader/upgrader-v2tov4/clean.bat → ...oaders/BPv3/old/upgrader-v2tov4/clean.bat
View file
Open in desktop
File renamed without changes.
0 ...3-bootloader/upgrader-v2tov4/convert.html → ...ers/BPv3/old/upgrader-v2tov4/convert.html
View file
Open in desktop
File renamed without changes.
0 ...Pv3-bootloader/upgrader-v2tov4/firmware.h → ...aders/BPv3/old/upgrader-v2tov4/firmware.h
View file
Open in desktop
File renamed without changes.
0 ...s/BPv3-bootloader/upgrader-v2tov4/flash.h → Bootloaders/BPv3/old/upgrader-v2tov4/flash.h
View file
Open in desktop
File renamed without changes.
0 ...s/BPv3-bootloader/upgrader-v2tov4/flash.s → Bootloaders/BPv3/old/upgrader-v2tov4/flash.s
View file
Open in desktop
File renamed without changes.
0 ...Pv3-bootloader/upgrader-v2tov4/hardware.h → ...aders/BPv3/old/upgrader-v2tov4/hardware.h
View file
Open in desktop
File renamed without changes.
0 ...-bootloader/upgrader-v2tov4/hardwarev0a.h → ...rs/BPv3/old/upgrader-v2tov4/hardwarev0a.h
View file
Open in desktop
File renamed without changes.
0 ...-bootloader/upgrader-v2tov4/hardwarev1a.h → ...rs/BPv3/old/upgrader-v2tov4/hardwarev1a.h
View file
Open in desktop
File renamed without changes.
0 ...-bootloader/upgrader-v2tov4/hardwarev25.h → ...rs/BPv3/old/upgrader-v2tov4/hardwarev25.h
View file
Open in desktop
File renamed without changes.
0 ...-bootloader/upgrader-v2tov4/hardwarev2a.h → ...rs/BPv3/old/upgrader-v2tov4/hardwarev2a.h
View file
Open in desktop
File renamed without changes.
0 ...3-bootloader/upgrader-v2tov4/hardwarev3.h → ...ers/BPv3/old/upgrader-v2tov4/hardwarev3.h
View file
Open in desktop
File renamed without changes.
0 ...-bootloader/upgrader-v2tov4/hex2prog.html → ...rs/BPv3/old/upgrader-v2tov4/hex2prog.html
View file
Open in desktop
File renamed without changes.
0 ...-bootloader/upgrader-v2tov4/installer.mcp → ...rs/BPv3/old/upgrader-v2tov4/installer.mcp
View file
Open in desktop
File renamed without changes.
0 ...-bootloader/upgrader-v2tov4/installer.mcs → ...rs/BPv3/old/upgrader-v2tov4/installer.mcs
View file
Open in desktop
File renamed without changes.
0 ...-bootloader/upgrader-v2tov4/installer.mcw → ...rs/BPv3/old/upgrader-v2tov4/installer.mcw
View file
Open in desktop
File renamed without changes.
0 ...rs/BPv3-bootloader/upgrader-v2tov4/main.c → Bootloaders/BPv3/old/upgrader-v2tov4/main.c
View file
Open in desktop
File renamed without changes.
0 ...BPv3-bootloader/upgrader-v4tov4/clean.bat → ...oaders/BPv3/old/upgrader-v4tov4/clean.bat
View file
Open in desktop
File renamed without changes.
0 ...3-bootloader/upgrader-v4tov4/convert.html → ...ers/BPv3/old/upgrader-v4tov4/convert.html
View file
Open in desktop
File renamed without changes.
0 ...Pv3-bootloader/upgrader-v4tov4/firmware.h → ...aders/BPv3/old/upgrader-v4tov4/firmware.h
View file
Open in desktop
File renamed without changes.
0 ...s/BPv3-bootloader/upgrader-v4tov4/flash.h → Bootloaders/BPv3/old/upgrader-v4tov4/flash.h
View file
Open in desktop
File renamed without changes.
0 ...s/BPv3-bootloader/upgrader-v4tov4/flash.s → Bootloaders/BPv3/old/upgrader-v4tov4/flash.s
View file
Open in desktop
File renamed without changes.
0 ...Pv3-bootloader/upgrader-v4tov4/hardware.h → ...aders/BPv3/old/upgrader-v4tov4/hardware.h
View file
Open in desktop
File renamed without changes.
0 ...-bootloader/upgrader-v4tov4/hardwarev0a.h → ...rs/BPv3/old/upgrader-v4tov4/hardwarev0a.h
View file
Open in desktop
File renamed without changes.
0 ...-bootloader/upgrader-v4tov4/hardwarev1a.h → ...rs/BPv3/old/upgrader-v4tov4/hardwarev1a.h
View file
Open in desktop
File renamed without changes.
0 ...-bootloader/upgrader-v4tov4/hardwarev25.h → ...rs/BPv3/old/upgrader-v4tov4/hardwarev25.h
View file
Open in desktop
File renamed without changes.
0 ...-bootloader/upgrader-v4tov4/hardwarev2a.h → ...rs/BPv3/old/upgrader-v4tov4/hardwarev2a.h
View file
Open in desktop
File renamed without changes.
0 ...3-bootloader/upgrader-v4tov4/hardwarev3.h → ...ers/BPv3/old/upgrader-v4tov4/hardwarev3.h
View file
Open in desktop
File renamed without changes.
0 ...-bootloader/upgrader-v4tov4/hex2prog.html → ...rs/BPv3/old/upgrader-v4tov4/hex2prog.html
View file
Open in desktop
File renamed without changes.
0 ...-bootloader/upgrader-v4tov4/installer.mcp → ...rs/BPv3/old/upgrader-v4tov4/installer.mcp
View file
Open in desktop
File renamed without changes.
0 ...-bootloader/upgrader-v4tov4/installer.mcs → ...rs/BPv3/old/upgrader-v4tov4/installer.mcs
View file
Open in desktop
File renamed without changes.
0 ...-bootloader/upgrader-v4tov4/installer.mcw → ...rs/BPv3/old/upgrader-v4tov4/installer.mcw
View file
Open in desktop
File renamed without changes.
0 ...rs/BPv3-bootloader/upgrader-v4tov4/main.c → Bootloaders/BPv3/old/upgrader-v4tov4/main.c
View file
Open in desktop
File renamed without changes.
0 ...otloader/upgrader-v4tov4/p24FJ64GA002.gld → ...BPv3/old/upgrader-v4tov4/p24FJ64GA002.gld
View file
Open in desktop
File renamed without changes.
0 ...ate/upgrader/BPv3-v2blupdaterVa3-v4.1.hex → ...ate/upgrader/BPv3-v2blupdaterVa3-v4.1.hex
View file
Open in desktop
File renamed without changes.
0 ...tov4-bootloader-update/upgrader/P24QP.exe → ...tov4-bootloader-update/upgrader/P24QP.exe
View file
Open in desktop
File renamed without changes.
0 ...tov4-bootloader-update/upgrader/P24qp.ini → ...tov4-bootloader-update/upgrader/P24qp.ini
View file
Open in desktop
File renamed without changes.
0 ...2tov4-bootloader-update/upgrader/P24qp.py → ...2tov4-bootloader-update/upgrader/P24qp.py
View file
Open in desktop
File renamed without changes.
0 ...v4-bootloader-update/upgrader/PICBOOT.dll → ...v4-bootloader-update/upgrader/PICBOOT.dll
View file
Open in desktop
File renamed without changes.
0 ...-update/v4firmware/BPv3-Firmware-v4.1.hex → ...-update/v4firmware/BPv3-Firmware-v4.1.hex
View file
Open in desktop
File renamed without changes.
0 ...-bootloader-update/v4firmware/GHelper.dll → ...-bootloader-update/v4firmware/GHelper.dll
View file
Open in desktop
File renamed without changes.
0 ...der-update/v4firmware/ds30 Loader GUI.exe → ...der-update/v4firmware/ds30 Loader GUI.exe
View file
Open in desktop
File renamed without changes.
0 ...tloader-update/v4firmware/ds30 Loader.dll → ...tloader-update/v4firmware/ds30 Loader.dll
View file
Open in desktop
File renamed without changes.
0 ...bootloader-update/v4firmware/settings.xml → ...bootloader-update/v4firmware/settings.xml
View file
Open in desktop
File renamed without changes.
0 ...ov43-bootloader-update/!v4UPGRADES!!!.txt → ...ov43-bootloader-update/!v4UPGRADES!!!.txt
View file
Open in desktop
File renamed without changes.
0 ...tov43-bootloader-update/!v4UPGRADES!!.txt → ...tov43-bootloader-update/!v4UPGRADES!!.txt
View file
Open in desktop
File renamed without changes.
0 ...xtov43-bootloader-update/!v4UPGRADES!.txt → ...xtov43-bootloader-update/!v4UPGRADES!.txt
View file
Open in desktop
File renamed without changes.
0 ...-bootloader-update/BPv3-Firmware-v4.5.hex → ...-bootloader-update/BPv3-Firmware-v4.5.hex
View file
Open in desktop
File renamed without changes.
0 ...ate/BPv3-bootloader-upgrade-v4xtov4.3.hex → ...ate/BPv3-bootloader-upgrade-v4xtov4.3.hex
View file
Open in desktop
File renamed without changes.
0 ...oader-update/utilities/!v4UPGRADES!!!.txt → ...oader-update/utilities/!v4UPGRADES!!!.txt
View file
Open in desktop
File renamed without changes.
0 ...loader-update/utilities/!v4UPGRADES!!.txt → ...loader-update/utilities/!v4UPGRADES!!.txt
View file
Open in desktop
File renamed without changes.
0 ...tloader-update/utilities/!v4UPGRADES!.txt → ...tloader-update/utilities/!v4UPGRADES!.txt
View file
Open in desktop
File renamed without changes.
0 ...3-bootloader-update/utilities/GHelper.dll → ...3-bootloader-update/utilities/GHelper.dll
View file
Open in desktop
File renamed without changes.
0 ...ader-update/utilities/ds30 Loader GUI.exe → ...ader-update/utilities/ds30 Loader GUI.exe
View file
Open in desktop
File renamed without changes.
0 ...otloader-update/utilities/ds30 Loader.dll → ...otloader-update/utilities/ds30 Loader.dll
View file
Open in desktop
File renamed without changes.
0 ...loader-update/utilities/pirate-loader.exe → ...loader-update/utilities/pirate-loader.exe
View file
Open in desktop
File renamed without changes.
0 ...loader-update/utilities/pirate-loader_lnx → ...loader-update/utilities/pirate-loader_lnx
View file
Open in desktop
File renamed without changes.
0 ...loader-update/utilities/pirate-loader_mac → ...loader-update/utilities/pirate-loader_mac
View file
Open in desktop
File renamed without changes.
0 ...-bootloader-update/utilities/settings.xml → ...-bootloader-update/utilities/settings.xml
View file
Open in desktop
File renamed without changes.
0 ...bootloader/firmware-v4.5/p24FJ64GA002.gld → Bootloaders/BPv3/p24FJ64GA002.gld
View file
Open in desktop
File renamed without changes.
0 ...Pv3-bootloader/firmware-v4.5/settings.inc → Bootloaders/BPv3/settings.inc
View file
Open in desktop
File renamed without changes.
20 changes: 0 additions & 20 deletions Bootloaders/BPv4-bootloader/pirate-loader/CMakeLists.txt
View file
Open in desktop

This file was deleted.

34 changes: 0 additions & 34 deletions Bootloaders/BPv4-bootloader/pirate-loader/test.bat
View file
Open in desktop

This file was deleted.

55 changes: 0 additions & 55 deletions Bootloaders/BPv4-bootloader/pirate-loader/test.sh
View file
Open in desktop

This file was deleted.

0 ...BPv4-bootloader/firmware-v1/boot_config.h → Bootloaders/BPv4/boot_config.h
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion .../BPv4-bootloader/firmware-v1/bootloader.c → Bootloaders/BPv4/bootloader.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ BYTE bldone = 0;
extern BYTE cdc_In_buffer[64];
extern BYTE cdc_Out_buffer[64];
#define VER_H 0x04
#define VER_L 0x0a
#define VER_L 0x0b

unsigned int userversion __attribute__((space(prog),address(BLENDADDR-9))) = ((VER_H<<8)|VER_L);

Expand Down
0 .../BPv4-bootloader/firmware-v1/bootloader.h → Bootloaders/BPv4/bootloader.h
View file
Open in desktop
File renamed without changes.
0 ...er/firmware-v1/bpv4-bootloader.X/Makefile → Bootloaders/BPv4/bpv4-bootloader.X/Makefile
View file
Open in desktop
File renamed without changes.
0 ...bootloader.X/nbproject/configurations.xml → ...bootloader.X/nbproject/configurations.xml
View file
Open in desktop
File renamed without changes.
0 ...1/bpv4-bootloader.X/nbproject/project.xml → ...4/bpv4-bootloader.X/nbproject/project.xml
View file
Open in desktop
File renamed without changes.
0 ...loaders/BPv4-bootloader/firmware-v1/cdc.c → Bootloaders/BPv4/cdc.c
View file
Open in desktop
File renamed without changes.
0 ...loaders/BPv4-bootloader/firmware-v1/cdc.h → Bootloaders/BPv4/cdc.h
View file
Open in desktop
File renamed without changes.
0 ...BPv4-bootloader/firmware-v1/descriptors.h → Bootloaders/BPv4/descriptors.h
View file
Open in desktop
File renamed without changes.
0 ...ers/BPv4-bootloader/firmware-v1/globals.h → Bootloaders/BPv4/globals.h
View file
Open in desktop
File renamed without changes.
0 ...oaders/BPv4-bootloader/firmware-v1/main.c → Bootloaders/BPv4/main.c
View file
Open in desktop
File renamed without changes.
0 ...-bootloader/firmware-v1/p24FJ256GB106.gld → Bootloaders/BPv4/p24FJ256GB106.gld
View file
Open in desktop
File renamed without changes.
0 ...ders/BPv4-bootloader/firmware-v1/picusb.h → Bootloaders/BPv4/picusb.h
View file
Open in desktop
File renamed without changes.
0 ...rs/BPv4-bootloader/firmware-v1/usb_lang.h → Bootloaders/BPv4/usb_lang.h
View file
Open in desktop
File renamed without changes.
0 ...s/BPv4-bootloader/firmware-v1/usb_stack.c → Bootloaders/BPv4/usb_stack.c
View file
Open in desktop
File renamed without changes.
0 ...s/BPv4-bootloader/firmware-v1/usb_stack.h → Bootloaders/BPv4/usb_stack.h
View file
Open in desktop
File renamed without changes.
0 ...3-bootloader/pirate-loader/CMakeLists.txt → Bootloaders/pirate-loader/CMakeLists.txt
View file
Open in desktop
File renamed without changes.
0 ...-bootloader/pirate-loader/pirate-loader.c → Bootloaders/pirate-loader/pirate-loader.c
View file
Open in desktop
File renamed without changes.
0 ...rs/BPv3-bootloader/pirate-loader/test.bat → Bootloaders/pirate-loader/test.bat
View file
Open in desktop
File renamed without changes.
0 ...ers/BPv3-bootloader/pirate-loader/test.sh → Bootloaders/pirate-loader/test.sh
View file
Open in desktop
File renamed without changes.