rp2040

commit 0918201676de0b392e5bbdbe1dbb355e7edf3a1c
parent 63b2f6358e4bfb756076bb53195eb60bb5028640
Author: Matsuda Kenji <info@mtkn.jp>
Date:   Sat,  1 Apr 2023 09:46:27 +0900

trying to make boot2

Diffstat:
M
Makefile
 | 
12
++++++------
M
boot2/boot2.S
 | 
12
++++++------

2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/Makefile b/Makefile
@@ -26,14 +26,14 @@ start.o: start.s
 
 #boot2_crc.o: boot2/bs2_default_padded_checksummed.S
 #	$(AS) $(ASFLAGS) -o boot2_crc.o boot2/bs2_default_padded_checksummed.S
-boot2/boot2_crc.S: boot2/bs2_default.bin
-	./bincrc boot2/bs2_default.bin boot2/boot2_crc.S
+#boot2/boot2_crc.S: boot2/bs2_default.bin
+#	./bincrc boot2/bs2_default.bin boot2/boot2_crc.S
 boot2_crc.o: boot2/boot2_crc.S
 	$(AS) $(ASFLAGS) -o boot2_crc.o boot2/boot2_crc.S
-#boot2/boot2_crc.S: boot2/boot2.S bincrc
-#	$(AS) $(ASFLAGS) -o boot2/boot2.o boot2/boot2.S
-#	$(OBJCOPY) -O binary boot2/boot2.o boot2/boot2.bin 
-#	./bincrc boot2/boot2.bin boot2/boot2_crc.S
+boot2/boot2_crc.S: boot2/boot2.S bincrc
+	$(AS) $(ASFLAGS) -o boot2/boot2.o boot2/boot2.S
+	$(OBJCOPY) -O binary boot2/boot2.o boot2/boot2.bin
+	./bincrc boot2/boot2.bin boot2/boot2_crc.S
 
 main.o: main.c
 	$(CC) $(CFLAGS) -o main.o main.c
diff --git a/boot2/boot2.S b/boot2/boot2.S
@@ -22,12 +22,12 @@ _stage2_boot:
 	str r1, [r3, #0x14] // SSI_BAUDR
 
 	mov r1, #0x0
-	lsl r1, r1, #21
+	lsl r1, r1, #21 // SPI_FRF
 	mov r2, #31
-	lsl r2, r2, #16
+	lsl r2, r2, #16 // DFS_32
 	add r1, r1, r2
-	mov r2, #0x3
-	lsl r2, r2, #8
+	mov r2, #0x0
+	lsl r2, r2, #8 // TMOD
 	add r1, r1, r2
 	str r1, [r3, #0x0] // SSI_CTRLR0
 
@@ -37,14 +37,14 @@ _stage2_boot:
 	lsl r2, r2, #8
 	add r1, r1, r2
 	mov r2, #6 // 24bit address length
-	lsl r2, r2, #2  
+	lsl r2, r2, #2
 	add r1, r1, r2
 	ldr r0, =0xf4
 	add r0, r0, r3 // SSI_SPI_CTRLR0
 	str r1, [r0, #0x0]
 
 	mov r1, #0x0
-	str r1, [r3, #0x0] // SSI_CTRLR1_OFFSET
+	str r1, [r3, #0x4] // SSI_CTRLR1_OFFSET
 
 	mov r1, #1
 	str r1, [r3, #0x8] // SSI_SSIENR_OFFSET