From: Stephan Baerwolf Date: Tue, 31 Jul 2012 18:45:37 +0000 (+0000) Subject: fix: always use full features X-Git-Tag: 2010-07-27-stephan-201207312045^0 X-Git-Url: http://git.linex4red.de/pub/USBaspLoader.git/commitdiff_plain/4c6612c6aa07f6c92fa4b42fe7c6adb945ea927c fix: always use full features Signed-off-by: Stephan Baerwolf --- diff --git a/firmware/bootloaderconfig.h b/firmware/bootloaderconfig.h index fdcb9d0..34d6cdf 100644 --- a/firmware/bootloaderconfig.h +++ b/firmware/bootloaderconfig.h @@ -107,9 +107,6 @@ these macros are defined, the boot loader usees them. * with up to 15 opcodes within BLS. * This array will be called "bootloader__do_spm", and implements the * "do_spm" subroutine from atmels "Instruction Set Manual" Rev.0856I, page 140. - * If additionally "HAVE_BLB11_SOFTW_BACKDOOR" is enabled, the array will just - * contain "NOP()" instructions, since other code can be flashed into via - * backdoor. * do_spm: ;input: spmcrval determines SPM action diff --git a/firmware/main.c b/firmware/main.c index b855d01..5c1233b 100644 --- a/firmware/main.c +++ b/firmware/main.c @@ -96,9 +96,6 @@ typedef union longConverter{ #if HAVE_DOSPM_TUNNELCMD -#if HAVE_BLB11_SOFTW_BACKDOOR - const uint16_t bootloader__do_spm[15] PROGMEM = {0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000}; -#else /* do_spm: ;input: spmcrval determines SPM action @@ -122,12 +119,11 @@ out SREG, temp2 ret */ #if defined (__AVR_ATmega8__) - const uint16_t bootloader__do_spm[15] PROGMEM = {0xb68f , 0x94f8, 0xb677, 0xfc70, 0xcffd, 0xbe97, 0x95e8, 0xbe8f, 0x9508, 0x00, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF}; + const uint16_t bootloader__do_spm[15] PROGMEM = {0xb68f , 0x94f8, 0xb677, 0xfc70, 0xcffd, 0xbe97, 0x95e8, 0xbe8f, 0x9508, 0x00, 0xFFFF, 0x95e8, 0x9508, 0x0000, 0xFFFF}; #else #error "bootloader__do_spm has to be adapted, since there is no guaranty for SREG==0x3f, SPMCR==0x37, SPMEN==0x00" #endif #endif -#endif #if BOOTLOADER_CAN_EXIT