avr: adapted boot firmware for n21 abd n22.

avr/devices/n22/boot.asm

@@ -93,8 +93,7 @@ firmwareStart:   rjmp main ; will be overwritten when flashing
 
 
 main:
-  rjmp bootLoader ; this routine is in modules/flash/proto.asm
-
+  rjmp bootLoader ; this routine is in modules/bootloader/main.asm
 
 
 
@@ -108,17 +107,33 @@ main:
 .include "common/utils_wait_fixed.asm"
 .include "common/utils_copy_from_flash.asm"
 .include "common/utils_copy_sdram.asm"
-.include "modules/flash/bootloader.asm"
-.include "modules/flash/flash.asm"
-.include "modules/flash/recv.asm"
-.include "modules/flash/send.asm"
+
+.include "modules/flash/defs.asm"
+.include "modules/flash/eeprom.asm"
+.include "modules/flash/io.asm"
+.include "modules/flash/io_attn.asm"
+.include "modules/flash/io_bitbang.asm"
+.include "modules/flash/flash1p.asm"
+.include "modules/flash/flashprocess.asm"
 .include "modules/flash/wait.asm"
-.include "modules/flash/hdl_flash_start.asm"
-.include "modules/flash/hdl_flash_data.asm"
-.include "modules/flash/hdl_flash_end.asm"
-.include "modules/flash/flash_rsp.asm"
-.include "modules/flash/flash_ready.asm"
+.include "modules/bootloader/main.asm"
 
 
 
+systemSetSpeed:
+.if clock == 8000000
+  ldi r16, (1<<CLKPCE)
+  ldi r17, 0
+  out CLKPR, r16
+  out CLKPR, r17
+.endif
+
+.if clock == 1000000
+  ldi r16, (1<<CLKPCE)
+  ldi r17, (1<<CLKPS1) | (1<<CLKPS0)
+  out CLKPR, r16
+  out CLKPR, r17
+.endif
+  ret
+