diff --git a/software/common/bootloader/bootloader.c b/software/common/bootloader/bootloader.c index a0d402f34a7a5572b0a831489d28f3dbdd64d1be..9a9996a9c24a2f7ce2ef7bd437041a47233e0f54 100644 --- a/software/common/bootloader/bootloader.c +++ b/software/common/bootloader/bootloader.c @@ -71,8 +71,8 @@ void UartStdOutInit(void) if ((CMSDK_UART2->STATE & 1)==0) CMSDK_UART2->DATA = 0x7e; // write 8'b01111110 / "~" } else { // EXTIO mode - Data on UART1 CMSDK_UART1->CTRL = 0x00; //re-init - CMSDK_UART1->CTRL = UART_CTRL_TXRXEN; //RX+TX, EXTIO - if ((CMSDK_UART1->STATE & 1)==0) CMSDK_UART1->DATA = 0x7e; // write 8'b01111110 / "~" +// CMSDK_UART1->CTRL = UART_CTRL_TXRXEN; //RX+TX, EXTIO +// if ((CMSDK_UART1->STATE & 1)==0) CMSDK_UART1->DATA = 0x7e; // write 8'b01111110 / "~" } CMSDK_USRT2->CTRL = 0x00; //re-init CMSDK_USRT2->CTRL = UART_CTRL_TXRXEN; //RX+TX, FT1248/EXTIO USRT @@ -157,14 +157,16 @@ int main (void) else UartPuts("EXTIO8x4CD"); UartPuts(" 20241212\n"); +/* NVIC_EnableIRQ(UARTRX1_IRQn); NVIC_EnableIRQ(UARTTX1_IRQn); CMSDK_UART1->CTRL = UART_CTRL_RXIRQEN; // Enable RX interrupt - +*/ FlashLoader(); return 0; } +/* void UARTRX1_Handler(void) { uart1_char = CMSDK_UART1->DATA; // read and store the byte received @@ -180,3 +182,4 @@ void UARTTX1_Handler(void) CMSDK_UART1->CTRL = UART_CTRL_RXIRQEN; // Re-Enable RX interrupt return; } +*/ diff --git a/testcodes/bootloader/bootloader.hex b/testcodes/bootloader/bootloader.hex index 68133be5984446712a3f0283c8244129b70cc9ca..4a91c68ec2c4740520853b11bb5a8c26687794e4 100644 --- a/testcodes/bootloader/bootloader.hex +++ b/testcodes/bootloader/bootloader.hex @@ -2,16 +2,16 @@ 04 00 30 -15 -03 +C9 +02 00 10 -1D -03 +D1 +02 00 10 -1F -03 +D3 +02 00 10 00 @@ -42,8 +42,8 @@ 00 00 00 -21 -03 +D5 +02 00 10 00 @@ -54,140 +54,140 @@ 00 00 00 -23 -03 +D7 +02 00 10 -25 -03 +D9 +02 00 10 -27 -03 +DB +02 00 10 -27 -03 +DB +02 00 10 -53 +DB 02 00 10 -65 +DB 02 00 10 -27 -03 +DB +02 00 10 -27 -03 +DB +02 00 10 -27 -03 +DB +02 00 10 -27 -03 +DB +02 00 10 -27 -03 +DB +02 00 10 -27 -03 +DB +02 00 10 -27 -03 +DB +02 00 10 -27 -03 +DB +02 00 10 -27 -03 +DB +02 00 10 -27 -03 +DB +02 00 10 -27 -03 +DB +02 00 10 -27 -03 +DB +02 00 10 -27 -03 +DB +02 00 10 -27 -03 +DB +02 00 10 -27 -03 +DB +02 00 10 -27 -03 +DB +02 00 10 -27 -03 +DB +02 00 10 -27 -03 +DB +02 00 10 -27 -03 +DB +02 00 10 -27 -03 +DB +02 00 10 -27 -03 +DB +02 00 10 -27 -03 +DB +02 00 10 -27 -03 +DB +02 00 10 -27 -03 +DB +02 00 10 -27 -03 +DB +02 00 10 -27 -03 +DB +02 00 10 -27 -03 +DB +02 00 10 -27 -03 +DB +02 00 10 00 @@ -250,11 +250,11 @@ AB 43 18 47 -BC +70 02 00 00 -DC +90 02 00 00 @@ -324,8 +324,8 @@ B5 BD 00 F0 -05 -F9 +DF +F8 11 46 FF @@ -334,12 +334,12 @@ F7 FF 00 F0 -60 +59 F8 00 F0 -1D -F9 +F7 +F8 03 B4 FF @@ -350,8 +350,8 @@ FF BC 00 F0 -23 -F9 +FD +F8 00 00 00 @@ -367,68 +367,56 @@ F9 00 00 30 -B4 -41 -4C -20 +4A +10 68 -7E -23 -00 -06 00 21 -03 -22 +00 +06 00 28 -0C +0D DA -3E +2E 48 81 60 -3E -4D -05 +2E +4B +03 61 01 -25 -85 +23 +83 60 20 -25 -A5 +23 +93 61 -44 +42 68 -E4 +D2 07 -08 +04 D1 -03 +7E +22 +02 60 -06 +01 E0 -39 +29 48 81 60 -82 -60 -44 -68 -E4 -07 -00 -D1 -03 -60 -37 +29 48 81 60 -82 +03 +21 +81 60 41 68 @@ -440,11 +428,9 @@ D1 21 01 60 -30 -BC 70 47 -32 +24 49 4A 68 @@ -482,7 +468,7 @@ D1 BD 10 B5 -29 +1C 4C 20 68 @@ -490,7 +476,7 @@ B5 28 0B D0 -28 +1B A0 FF F7 @@ -510,11 +496,11 @@ F3 8F FF F7 -B1 +B8 FF 10 BD -26 +19 A0 FF F7 @@ -532,15 +518,15 @@ E7 B5 FF F7 -AC +B3 FF -24 +17 A0 FF F7 D6 FF -16 +08 48 00 68 @@ -548,7 +534,7 @@ FF 06 03 D5 -2A +1C A0 FF F7 @@ -556,80 +542,26 @@ CF FF 02 E0 -2B +1D A0 FF F7 CB FF -2C +1F A0 FF F7 C8 FF -2E -48 -04 -21 -01 -60 -08 -21 -01 -60 -0F -49 -0B -20 -88 -60 FF F7 -CA +D2 FF 00 20 10 BD -0C -48 -01 -68 -28 -4A -11 -60 -02 -21 -C1 -60 -07 -21 -81 -60 -70 -47 -24 -48 -01 -68 -06 -48 -01 -60 -01 -21 -C1 -60 -0B -21 -81 -60 -70 -47 -00 -00 00 10 01 @@ -754,14 +686,6 @@ F0 0A 00 00 -00 -E1 -00 -E0 -00 -00 -00 -30 04 49 03 @@ -782,7 +706,7 @@ E0 1C 4E 0E -04 +00 00 00 30 @@ -818,8 +742,8 @@ E7 47 00 00 -05 -03 +B9 +02 00 10 C1 @@ -922,15 +846,15 @@ C0 46 FF F7 -DC -FE +02 +FF 10 BD 00 48 70 47 -08 +04 00 00 30 @@ -950,7 +874,7 @@ E7 47 00 00 -D8 +8C 03 00 10 @@ -958,7 +882,7 @@ D8 00 00 30 -08 +04 00 00 00 @@ -966,15 +890,15 @@ D8 01 00 10 -E0 +90 03 00 10 -08 +04 00 00 30 -60 +64 04 00 00 @@ -983,10 +907,6 @@ E0 00 10 00 -00 -00 -00 -00 1C 4E 0E