diff options
| -rw-r--r-- | hexedit/Makefile | 22 | ||||
| -rw-r--r-- | octedit/Makefile | 22 | ||||
| -rw-r--r-- | octedit/main.s (renamed from hexedit/main.s) | 2 | ||||
| -rw-r--r-- | octedit/octedit.s (renamed from hexedit/hexedit.s) | 6 | ||||
| -rw-r--r-- | octedit/pico_persist.ld (renamed from hexedit/pico_persist.ld) | 0 | ||||
| -rw-r--r-- | octedit/uart.s (renamed from hexedit/uart.s) | 0 |
6 files changed, 26 insertions, 26 deletions
diff --git a/hexedit/Makefile b/hexedit/Makefile deleted file mode 100644 index dd70409..0000000 --- a/hexedit/Makefile +++ /dev/null @@ -1,22 +0,0 @@ -all: build - -build: hexedit.uf2 - -hexedit.uf2: hexedit.elf - ../elf/elf2uf2 hexedit.elf hexedit.uf2 - -objects = uart.o main.o hexedit.o - -hexedit.elf: $(objects) - arm-none-eabi-ld -T pico_persist.ld -o hexedit.elf $(objects) ../setup/setup.so - ./checksum_pico_elf.py hexedit.elf - -$(objects): %.o: %.s - arm-none-eabi-as -o $@ $< - -clean: - rm hexedit.elf hexedit.uf2 *.o - -flash: hexedit.uf2 - [ -h /dev/disk/by-label/RPI-RP2 ] || sleep 3s - cat hexedit.uf2 > /dev/disk/by-label/RPI-RP2 diff --git a/octedit/Makefile b/octedit/Makefile new file mode 100644 index 0000000..26601c8 --- /dev/null +++ b/octedit/Makefile @@ -0,0 +1,22 @@ +all: build + +build: octedit.uf2 + +octedit.uf2: octedit.elf + ../elf/elf2uf2 octedit.elf octedit.uf2 + +objects = uart.o main.o octedit.o + +octedit.elf: $(objects) + arm-none-eabi-ld -T pico_persist.ld -o octedit.elf $(objects) ../setup/setup.so + ./checksum_pico_elf.py octedit.elf + +$(objects): %.o: %.s + arm-none-eabi-as -o $@ $< + +clean: + rm octedit.elf octedit.uf2 *.o + +flash: octedit.uf2 + [ -h /dev/disk/by-label/RPI-RP2 ] || sleep 3s + cat octedit.uf2 > /dev/disk/by-label/RPI-RP2 diff --git a/hexedit/main.s b/octedit/main.s index a12b4b3..6c471ec 100644 --- a/hexedit/main.s +++ b/octedit/main.s @@ -12,7 +12,7 @@ main: bl setup_clocks bl setup_gpio bl setup_uart - b hexedit + b octedit .section .stage_2_crc .word 0x00000000 diff --git a/hexedit/hexedit.s b/octedit/octedit.s index 0800a3a..9445fd8 100644 --- a/hexedit/hexedit.s +++ b/octedit/octedit.s @@ -4,10 +4,10 @@ .equ SRAM_BASE, 0x20000000 -.type hexedit, %function -.global hexedit +.type octedit, %function +.global octedit -hexedit: +octedit: ldr r6, =SRAM_BASE adds r5, r6, 1 10: diff --git a/hexedit/pico_persist.ld b/octedit/pico_persist.ld index 9c37aba..9c37aba 100644 --- a/hexedit/pico_persist.ld +++ b/octedit/pico_persist.ld diff --git a/hexedit/uart.s b/octedit/uart.s index e79cbdc..e79cbdc 100644 --- a/hexedit/uart.s +++ b/octedit/uart.s |