commit bde75f4c695a7ebf21af766042568eeabc3cf860
parent a0c6afd9d8c55169f254d251a6d993c42aaa3890
Author: Matsuda Kenji <info@mtkn.jp>
Date: Sat, 22 Apr 2023 09:49:34 +0900
delete unnecessary lines
Diffstat:
2 files changed, 3 insertions(+), 28 deletions(-)
diff --git a/ex1/boot2.s b/ex1/boot2.s
@@ -2,19 +2,12 @@
.thumb
.section .boot2
- .thumb_func
setup_xip:
-/*
- // setup QSPI pad
- ldr r4, pads_qspi_base
- ldr r1, =(0 << 4 | 0 << 1 | 1) // 2mA, schmitt off, slew fast
- str r1, [r4, #0x4] // PADS_QSPI: GPIO_QSPI_SCLK
-*/
- ldr r4, rom_base
+ ldr r3, rom_base
- ldrh r0, [r4, #0x14] // rom_func_table
+ ldrh r0, [r3, #0x14] // rom_func_table
ldr r1, =('C' | 'X' << 8) // _flash_enter_cmd_xip()
- ldrh r2, [r4, #0x18] // rom_table_lookup
+ ldrh r2, [r3, #0x18] // rom_table_lookup
blx r2
blx r0
@@ -31,8 +24,6 @@ rom_base:
.word 0x00000000
boot2_end:
.word 0x10000000 + 0x100
-pads_qspi_base:
- .word 0x40020000
m0plus_vtor:
.word 0xe0000000 + 0xed08
literals:
diff --git a/ex1/main.s b/ex1/main.s
@@ -53,27 +53,11 @@ delay_loop:
// data
.align 2
-atomic_set:
- .word 0x00002000
atomic_clr:
.word 0x00003000
-xip_ssi_base:
- .word 0x18000000
-clocks_base:
- .word 0x40008000
resets_base:
.word 0x4000c000
-reset_done:
- .word 0x4000c008
io_bank0_base:
.word 0x40014000
-xosc_base:
- .word 0x40024000
-pll_sys_base:
- .word 0x40028000
-uart0_base:
- .word 0x40034000
-rosc_base:
- .word 0x40060000
sio_base:
.word 0xd0000000
