• R/O
  • HTTP
  • SSH
  • HTTPS

Bootloader: Commit

MicroChip社のAN1388のSDカード部分だけです。また一部、SAAPに合わせて修正してあります。


Commit MetaInfo

Revisiónb076e4c1c04248b269e414e3cc0b4b39338ccaf8 (tree)
Tiempo2012-10-15 00:02:25
AutorSatoshi Yasuda <7m3tjz@jk1z...>
CommiterSatoshi Yasuda

Log Message

V01.02

Signed-off-by: Satoshi Yasuda <7m3tjz@jk1zrw.org>

Cambiar Resumen

Diferencia incremental

--- a/Universal Bootloader/Firmware/Bootloader/Include/BootLoader.h
+++ b/Universal Bootloader/Firmware/Bootloader/Include/BootLoader.h
@@ -29,7 +29,7 @@
2929
3030 //-------User configurable macros begin---------
3131 #define MAJOR_VERSION 1
32-#define MINOR_VERSION 0
32+#define MINOR_VERSION 2
3333
3434
3535 /* APP_FLASH_BASE_ADDRESS and APP_FLASH_END_ADDRESS reserves program Flash for the application*/
@@ -40,12 +40,12 @@
4040
4141 2)The base address and end address must align on 4K address boundary */
4242
43-#define APP_FLASH_BASE_ADDRESS 0x9D006000
43+#define APP_FLASH_BASE_ADDRESS 0x9D005000
4444 #define APP_FLASH_END_ADDRESS PROGRAM_FLASH_END_ADRESS
4545
4646 /* Address of the Flash from where the application starts executing */
4747 /* Rule: Set APP_FLASH_BASE_ADDRESS to _RESET_ADDR value of application linker script*/
48-#define USER_APP_RESET_ADDRESS (0x9D006000 + 0x1000 + 0x970)
48+#define USER_APP_RESET_ADDRESS (0x9D005000 + 0x1000 + 0x970)
4949
5050
5151 //-------User configurable macros end-----------
Binary files a/Universal Bootloader/Firmware/Bootloader/MPLAB_Workspace/Object - MDD File System-SD-PIC32/sd_bootloader.o and b/Universal Bootloader/Firmware/Bootloader/MPLAB_Workspace/Object - MDD File System-SD-PIC32/sd_bootloader.o differ
--- a/Universal Bootloader/Firmware/Bootloader/MPLAB_Workspace/SD_Card_Btl_Explorer16.mcs
+++ b/Universal Bootloader/Firmware/Bootloader/MPLAB_Workspace/SD_Card_Btl_Explorer16.mcs
@@ -13,7 +13,7 @@ SOLK=<src>|..\Source\SD\sd_bootloader.c|..\Source\MDD File System\FSIO.c|..\Sour
1313 SuiteArgsString=
1414 ToolArgsString=-g -mips16 -DTRANSPORT_LAYER_SD_CARD -DDEMO_BOARD_ETH_STARTER_KIT -Os
1515 TraceCmdString=
16-DebugOptions=-D__DEBUG -D__MPLAB_DEBUGGER_PIC32MXSK=1
16+DebugOptions=
1717 [File001]
1818 Location=C:\Universal Bootloader_011112\Universal Bootloader\Firmware\Bootloader\MPLAB_Workspace\Object - MDD File System-SD-PIC32\FSIO.o
1919 Folder=Intermediary
@@ -26,7 +26,7 @@ SOLK=<src>|..\Source\SD\sd_bootloader.c|..\Source\MDD File System\FSIO.c|..\Sour
2626 SuiteArgsString=
2727 ToolArgsString=-DTRANSPORT_LAYER_SD_CARD -DDEMO_BOARD_ETH_STARTER_KIT -Os
2828 TraceCmdString=
29-DebugOptions=-D__DEBUG -D__MPLAB_DEBUGGER_PIC32MXSK=1
29+DebugOptions=
3030 [File002]
3131 Location=C:\Universal Bootloader_011112\Universal Bootloader\Firmware\Bootloader\MPLAB_Workspace\Object - MDD File System-SD-PIC32\SD-SPI.o
3232 Folder=Intermediary
@@ -39,7 +39,7 @@ SOLK=<src>|..\Source\SD\sd_bootloader.c|..\Source\MDD File System\FSIO.c|..\Sour
3939 SuiteArgsString=
4040 ToolArgsString=-DTRANSPORT_LAYER_SD_CARD -DDEMO_BOARD_ETH_STARTER_KIT -Os
4141 TraceCmdString=
42-DebugOptions=-D__DEBUG -D__MPLAB_DEBUGGER_PIC32MXSK=1
42+DebugOptions=
4343 [File003]
4444 Location=C:\Universal Bootloader_011112\Universal Bootloader\Firmware\Bootloader\MPLAB_Workspace\Object - MDD File System-SD-PIC32\NVMem.o
4545 Folder=Intermediary
@@ -52,7 +52,7 @@ SOLK=<src>|..\Source\SD\sd_bootloader.c|..\Source\MDD File System\FSIO.c|..\Sour
5252 SuiteArgsString=
5353 ToolArgsString=-DTRANSPORT_LAYER_SD_CARD -DDEMO_BOARD_ETH_STARTER_KIT -Os
5454 TraceCmdString=
55-DebugOptions=-D__DEBUG -D__MPLAB_DEBUGGER_PIC32MXSK=1
55+DebugOptions=
5656 [File004]
5757 Location=C:\Universal Bootloader_011112\Universal Bootloader\Firmware\Bootloader\MPLAB_Workspace\.\output\SD_Card_Btl_Explorer16.elf
5858 Folder=Output
@@ -65,7 +65,7 @@ SOLK=<src>|..\Source\SD\sd_bootloader.c|..\Source\MDD File System\FSIO.c|..\Sour
6565 SuiteArgsString=
6666 ToolArgsString=-Map="$(BINDIR_)$(TARGETBASE).map" -o"$(BINDIR_)$(TARGETBASE).$(TARGETSUFFIX)"
6767 TraceCmdString=
68-DebugOptions=--defsym=__MPLAB_DEBUG=1 --defsym=__MPLAB_DEBUGGER_PIC32MXSK=1
68+DebugOptions=
6969 [File005]
7070 Location=C:\Universal Bootloader_011112\Universal Bootloader\Firmware\Bootloader\MPLAB_Workspace\.\output\SD_Card_Btl_Explorer16.hex
7171 Folder=Output
@@ -78,7 +78,7 @@ SOLK=<src>|..\Source\SD\sd_bootloader.c|..\Source\MDD File System\FSIO.c|..\Sour
7878 SuiteArgsString=
7979 ToolArgsString=-Map="$(BINDIR_)$(TARGETBASE).map" -o"$(BINDIR_)$(TARGETBASE).$(TARGETSUFFIX)"
8080 TraceCmdString=
81-DebugOptions=--defsym=__MPLAB_DEBUG=1 --defsym=__MPLAB_DEBUGGER_PIC32MXSK=1
81+DebugOptions=
8282 [TOOL_LOC_STAMPS]
8383 tool_loc{430F471F-7ECB-4852-A80D-DEF9A5C8E751}=C:\Program Files\Microchip\mplabc32\v2.02\bin\pic32-gcc.exe
8484 tool_loc{C68E5105-1196-4333-A0BF-3DC57271E614}=C:\Program Files\Microchip\mplabc32\v2.02\bin\pic32-ld.exe
Binary files a/Universal Bootloader/Firmware/Bootloader/MPLAB_Workspace/SD_Card_Btl_Explorer16.mcw and b/Universal Bootloader/Firmware/Bootloader/MPLAB_Workspace/SD_Card_Btl_Explorer16.mcw differ
Binary files a/Universal Bootloader/Firmware/Bootloader/MPLAB_Workspace/output/SD_Card_Btl_Explorer16.elf and b/Universal Bootloader/Firmware/Bootloader/MPLAB_Workspace/output/SD_Card_Btl_Explorer16.elf differ
--- a/Universal Bootloader/Firmware/Bootloader/MPLAB_Workspace/output/SD_Card_Btl_Explorer16.hex
+++ b/Universal Bootloader/Firmware/Bootloader/MPLAB_Workspace/output/SD_Card_Btl_Explorer16.hex
@@ -782,7 +782,7 @@
782782 :102da8001400bfaf03000424a90f400f002005241e
783783 :102db800002042300100422c1400bf8f0800e003bd
784784 :102dc8001800bd27e8ffbd271400bfaf009d023cd7
785-:102dd8007079422409f84000000000001400bf8ff9
785+:102dd8007069422409f84000000000001400bf8f09
786786 :102de8000800e0031800bd2700008390d0ff62248c
787787 :102df800ff0042303700422c1b0040102110000019
788788 :102e08003a00662c0300c0100f006330890b400b9a
@@ -794,12 +794,12 @@
794794 :102e6800e8ffc0143a00662c0800e00300000000e8
795795 :102e7800d8ffbd272400bfaf2000b3af1c00b2affe
796796 :102e88001800b1af1400b0af88bf023c6020428c7c
797-:102e980000a042240010422c18004014009d103c51
798-:102ea800006010262188000088bf123c88bf133cb0
797+:102e980000b042240010422c18004014009d103c41
798+:102ea800005010262188000088bf123c88bf133cc0
799799 :102eb800b10d400f21200002030040100000000067
800800 :102ec800b20b400b00000000e060438e8000637c82
801801 :102ed80001006338e060428e8410627ce06042ae9c
802-:102ee800010031266020628e00a0422402130200f5
802+:102ee800010031266020628e00b0422402130200e5
803803 :102ef8002b102202eeff4014001010262400bf8f72
804804 :102f08002000b38f1c00b28f1800b18f1400b08f4f
805805 :102f18000800e0032800bd27d0ffbd272c00bfaf65
@@ -819,7 +819,7 @@
819819 :102ff800060040a001008390050043a002008390d2
820820 :10300800040043a01800448c0400438c2120830052
821821 :103018001400438c21188300040043ac00a0103c2a
822-:10302800009d123c00605226420c400b88bf133ca6
822+:10302800009d123c00505226420c400b88bf133cb6
823823 :103038000400428c0080113c258822022b103202a9
824824 :1030480023004014200d02266020638eff9c023c62
825825 :10305800ffff4234211062002b1051001c00401465
@@ -843,7 +843,7 @@
843843 :103178002c00bf8f200d4224140040ac180040ac36
844844 :103188002c00bf8f2800b38f2400b28f2000b18f8e
845845 :103198001c00b08f0800e0033000bd27009d023cf2
846-:1031a8007079428c010042240800e0032b100200d1
846+:1031a8007069428c010042240800e0032b100200e1
847847 :1031b800d0ffbd272c00bfaf2800b4af2400b3afa9
848848 :1031c8002000b2af1c00b1af1800b0af1400a0a32c
849849 :1031d8004610400f000000002188400040000324f2
--- a/Universal Bootloader/Firmware/Bootloader/MPLAB_Workspace/output/SD_Card_Btl_Explorer16.map
+++ b/Universal Bootloader/Firmware/Bootloader/MPLAB_Workspace/output/SD_Card_Btl_Explorer16.map
@@ -860,25 +860,25 @@ LOAD c:/program files/microchip/mplabc32/v2.02/bin/../lib/gcc/pic32mx/4.5.1/../.
860860 .debug_abbrev 0x00000574 0x25 c:/program files/microchip/mplabc32/v2.02/bin/../lib/gcc/pic32mx/4.5.1/../../../../pic32mx/lib\libmchp_peripheral_32MX795F512L.a(port_read_bits_lib.o)
861861 .debug_abbrev 0x00000599 0x1 c:/program files/microchip/mplabc32/v2.02/bin/../lib/gcc/pic32mx/4.5.1/../../../../pic32mx/lib\libmchp_peripheral_32MX795F512L.a(_ports_tbl_libp.o)
862862
863-.debug_line 0x00000000 0x9b6
863+.debug_line 0x00000000 0x9b4
864864 *(.debug_line)
865- .debug_line 0x00000000 0x347 Object - MDD File System-SD-PIC32\sd_bootloader.o
866- .debug_line 0x00000347 0x87 c:/program files/microchip/mplabc32/v2.02/bin/../lib/gcc/pic32mx/4.5.1/../../../../pic32mx/lib\libc.a(ctypef.o)
867- .debug_line 0x000003ce 0xa4 c:/program files/microchip/mplabc32/v2.02/bin/../lib/gcc/pic32mx/4.5.1/../../../../pic32mx/lib\libc.a(default-general-exception-handler.o)
868- .debug_line 0x00000472 0xa6 c:/program files/microchip/mplabc32/v2.02/bin/../lib/gcc/pic32mx/4.5.1/../../../../pic32mx/lib\libc.a(default-bootstrap-exception-handler.o)
869- .debug_line 0x00000518 0x93 c:/program files/microchip/mplabc32/v2.02/bin/../lib/gcc/pic32mx/4.5.1/../../../../pic32mx/lib\libc.a(default-on-reset.o)
870- .debug_line 0x000005ab 0x97 c:/program files/microchip/mplabc32/v2.02/bin/../lib/gcc/pic32mx/4.5.1/../../../../pic32mx/lib\libc.a(default-on-bootstrap.o)
871- .debug_line 0x00000642 0x0 c:/program files/microchip/mplabc32/v2.02/bin/../lib/gcc/pic32mx/4.5.1/../../../../pic32mx/lib\libc.a(ctype.o)
872- .debug_line 0x00000642 0x6e c:/program files/microchip/mplabc32/v2.02/bin/../lib/gcc/pic32mx/4.5.1/../../../../pic32mx/lib\libmchp_peripheral.a(read_core_timer_lib.o)
873- .debug_line 0x000006b0 0x6f c:/program files/microchip/mplabc32/v2.02/bin/../lib/gcc/pic32mx/4.5.1/../../../../pic32mx/lib\libmchp_peripheral.a(write_core_timer_lib.o)
874- .debug_line 0x0000071f 0x62 c:/program files/microchip/mplabc32/v2.02/bin/../lib/gcc/pic32mx/4.5.1/../../../../pic32mx/lib\libmchp_peripheral_32MX795F512L.a(pcache.o)
875- .debug_line 0x00000781 0x73 c:/program files/microchip/mplabc32/v2.02/bin/../lib/gcc/pic32mx/4.5.1/../../../../pic32mx/lib\libmchp_peripheral_32MX795F512L.a(int_disable_interrupts_lib.o)
876- .debug_line 0x000007f4 0x73 c:/program files/microchip/mplabc32/v2.02/bin/../lib/gcc/pic32mx/4.5.1/../../../../pic32mx/lib\libmchp_peripheral_32MX795F512L.a(int_restore_interrupts_lib.o)
877- .debug_line 0x00000867 0x71 c:/program files/microchip/mplabc32/v2.02/bin/../lib/gcc/pic32mx/4.5.1/../../../../pic32mx/lib\libmchp_peripheral_32MX795F512L.a(spi_getc_spi1_lib_legacy.o)
878- .debug_line 0x000008d8 0x71 c:/program files/microchip/mplabc32/v2.02/bin/../lib/gcc/pic32mx/4.5.1/../../../../pic32mx/lib\libmchp_peripheral_32MX795F512L.a(spi_open_spi1_lib_legacy.o)
879- .debug_line 0x00000949 0x0 c:/program files/microchip/mplabc32/v2.02/bin/../lib/gcc/pic32mx/4.5.1/../../../../pic32mx/lib\libmchp_peripheral_32MX795F512L.a(spi_brg_tbl_lib_legacy.o)
880- .debug_line 0x00000949 0x6d c:/program files/microchip/mplabc32/v2.02/bin/../lib/gcc/pic32mx/4.5.1/../../../../pic32mx/lib\libmchp_peripheral_32MX795F512L.a(port_read_bits_lib.o)
881- .debug_line 0x000009b6 0x0 c:/program files/microchip/mplabc32/v2.02/bin/../lib/gcc/pic32mx/4.5.1/../../../../pic32mx/lib\libmchp_peripheral_32MX795F512L.a(_ports_tbl_libp.o)
865+ .debug_line 0x00000000 0x345 Object - MDD File System-SD-PIC32\sd_bootloader.o
866+ .debug_line 0x00000345 0x87 c:/program files/microchip/mplabc32/v2.02/bin/../lib/gcc/pic32mx/4.5.1/../../../../pic32mx/lib\libc.a(ctypef.o)
867+ .debug_line 0x000003cc 0xa4 c:/program files/microchip/mplabc32/v2.02/bin/../lib/gcc/pic32mx/4.5.1/../../../../pic32mx/lib\libc.a(default-general-exception-handler.o)
868+ .debug_line 0x00000470 0xa6 c:/program files/microchip/mplabc32/v2.02/bin/../lib/gcc/pic32mx/4.5.1/../../../../pic32mx/lib\libc.a(default-bootstrap-exception-handler.o)
869+ .debug_line 0x00000516 0x93 c:/program files/microchip/mplabc32/v2.02/bin/../lib/gcc/pic32mx/4.5.1/../../../../pic32mx/lib\libc.a(default-on-reset.o)
870+ .debug_line 0x000005a9 0x97 c:/program files/microchip/mplabc32/v2.02/bin/../lib/gcc/pic32mx/4.5.1/../../../../pic32mx/lib\libc.a(default-on-bootstrap.o)
871+ .debug_line 0x00000640 0x0 c:/program files/microchip/mplabc32/v2.02/bin/../lib/gcc/pic32mx/4.5.1/../../../../pic32mx/lib\libc.a(ctype.o)
872+ .debug_line 0x00000640 0x6e c:/program files/microchip/mplabc32/v2.02/bin/../lib/gcc/pic32mx/4.5.1/../../../../pic32mx/lib\libmchp_peripheral.a(read_core_timer_lib.o)
873+ .debug_line 0x000006ae 0x6f c:/program files/microchip/mplabc32/v2.02/bin/../lib/gcc/pic32mx/4.5.1/../../../../pic32mx/lib\libmchp_peripheral.a(write_core_timer_lib.o)
874+ .debug_line 0x0000071d 0x62 c:/program files/microchip/mplabc32/v2.02/bin/../lib/gcc/pic32mx/4.5.1/../../../../pic32mx/lib\libmchp_peripheral_32MX795F512L.a(pcache.o)
875+ .debug_line 0x0000077f 0x73 c:/program files/microchip/mplabc32/v2.02/bin/../lib/gcc/pic32mx/4.5.1/../../../../pic32mx/lib\libmchp_peripheral_32MX795F512L.a(int_disable_interrupts_lib.o)
876+ .debug_line 0x000007f2 0x73 c:/program files/microchip/mplabc32/v2.02/bin/../lib/gcc/pic32mx/4.5.1/../../../../pic32mx/lib\libmchp_peripheral_32MX795F512L.a(int_restore_interrupts_lib.o)
877+ .debug_line 0x00000865 0x71 c:/program files/microchip/mplabc32/v2.02/bin/../lib/gcc/pic32mx/4.5.1/../../../../pic32mx/lib\libmchp_peripheral_32MX795F512L.a(spi_getc_spi1_lib_legacy.o)
878+ .debug_line 0x000008d6 0x71 c:/program files/microchip/mplabc32/v2.02/bin/../lib/gcc/pic32mx/4.5.1/../../../../pic32mx/lib\libmchp_peripheral_32MX795F512L.a(spi_open_spi1_lib_legacy.o)
879+ .debug_line 0x00000947 0x0 c:/program files/microchip/mplabc32/v2.02/bin/../lib/gcc/pic32mx/4.5.1/../../../../pic32mx/lib\libmchp_peripheral_32MX795F512L.a(spi_brg_tbl_lib_legacy.o)
880+ .debug_line 0x00000947 0x6d c:/program files/microchip/mplabc32/v2.02/bin/../lib/gcc/pic32mx/4.5.1/../../../../pic32mx/lib\libmchp_peripheral_32MX795F512L.a(port_read_bits_lib.o)
881+ .debug_line 0x000009b4 0x0 c:/program files/microchip/mplabc32/v2.02/bin/../lib/gcc/pic32mx/4.5.1/../../../../pic32mx/lib\libmchp_peripheral_32MX795F512L.a(_ports_tbl_libp.o)
882882
883883 .debug_frame 0x00000000 0x370
884884 *(.debug_frame)
@@ -1002,8 +1002,6 @@ LOAD c:/program files/microchip/mplabc32/v2.02/bin/../lib/gcc/pic32mx/4.5.1/../.
10021002 .gnu.attributes
10031003 0x00000130 0x10 c:/program files/microchip/mplabc32/v2.02/bin/../lib/gcc/pic32mx/4.5.1/../../../../pic32mx/lib\libmchp_peripheral_32MX795F512L.a(_ports_tbl_libp.o)
10041004 0x00000001 __MPLAB_BUILD = 0x1
1005- 0x00000001 __MPLAB_DEBUG = 0x1
1006- 0x00000001 __MPLAB_DEBUGGER_PIC32MXSK = 0x1
10071005 LOAD c:/program files/microchip/mplabc32/v2.02/bin/../lib/gcc/pic32mx/4.5.1\libgcc.a
10081006 START GROUP
10091007 LOAD c:/program files/microchip/mplabc32/v2.02/bin/../lib/gcc/pic32mx/4.5.1/../../../../pic32mx/lib\libdebug.a
--- a/Universal Bootloader/Firmware/Bootloader/Source/SD/sd_bootloader.c
+++ b/Universal Bootloader/Firmware/Bootloader/Source/SD/sd_bootloader.c
@@ -136,18 +136,6 @@ int main(void)
136136 JumpToApp();
137137 }
138138
139-#if (((__PIC32_FEATURE_SET__ >= 100) && (__PIC32_FEATURE_SET__ <= 299)))
140- #error("TODO: For PIC32MX1xx/PIC32MX2xx devices, user must map the SPI ports to required I/Os using PPS");
141- /* Example Code
142- PPSInput(3,SDI2,RPn); // SDI2 mapping, where RPn = RPA2, RPB6....
143-
144- PPSOutput(2,RPn,SDO2);// SDO2 on RPA8
145-
146- //Do not forget to switch-off corrresponding "analog selection".
147- ANSELx = 0;
148- */
149-#endif
150-
151139 //Initialize the media
152140 while (!MDD_MediaDetect())
153141 {
@@ -246,11 +234,11 @@ int main(void)
246234
247235 }//while(1)
248236
249- Delayms(100);
237+ Delayms(500);
250238
251239 Reset();
252240
253- return 0;
241+// return 0;
254242 }
255243
256244
Show on old repository browser