rp2040

commit 959061696eb54cd410cd94f90e26ef901d284a3e
parent ca73e0d8fe0bb7221186454dd2e4d89c7dbb8690
Author: Matsuda Kenji <info@mtkn.jp>
Date:   Mon, 10 Apr 2023 08:51:08 +0900

fix Makefile

Diffstat:
M
Makefile
 | 
21
+++++++++++----------

1 file changed, 11 insertions(+), 10 deletions(-)
diff --git a/Makefile b/Makefile
@@ -7,8 +7,8 @@ ELF2UF2 = ../pico-sdk/build/elf2uf2/elf2uf2
 MCPU = -mcpu=cortex-m0plus
 
 ASFLAGS = $(MCPU)
-CFLAGS = $(MCPU) -ffreestanding -O0 -fpic -mthumb -c
-LDFLAGS = -norelax -nostdlib -nostartfiles
+CFLAGS = $(MCPU) -ffreestanding -nostartfiles -O0 -fpic -mthumb -c
+LDFLAGS = --no-relax -nostdlib
 
 all: led.uf2
 
@@ -21,9 +21,6 @@ clean:
 	rm -f boot2/*.bin
 	rm -f boot2/boot2_crc.s
 
-start.o: start.s
-	$(AS) $(ASFLAGS) -o start.o start.s
-
 boot2_crc.o: boot2/boot2.s bincrc
 	$(AS) $(ASFLAGS) -o boot2/boot2.o boot2/boot2.s
 	$(OBJCOPY) -O binary boot2/boot2.o boot2/boot2.bin
@@ -36,11 +33,15 @@ main.o: main.c
 mach.o: mach.s
 	$(AS) $(ASFLAGS) -o mach.o mach.s
 
-led.elf: start.o boot2_crc.o main.o mach.o
-	$(LD) $(LFLAGS) -o led.elf -T memmap.ld start.o boot2_crc.o mach.o main.o 
+led.elf: boot2_crc.o main.o mach.o
+	$(LD) $(LDFLAGS) -o led.elf -T memmap.ld boot2_crc.o mach.o main.o 
+led.bin: led.elf
+	$(OBJCOPY) -O binary led.elf led.bin
 
-led.uf2: led.elf
-	$(ELF2UF2) led.elf led.uf2
+#led.uf2: led.elf
+#	$(ELF2UF2) led.elf led.uf2
+led.uf2: led.bin bin2uf2
+	./bin2uf2 led.bin led.uf2
 
 flash: led.uf2
 	mount /dev/disk/by-label/RPI-RP2 /mnt
@@ -49,5 +50,5 @@ flash: led.uf2
 bincrc: tools/bincrc.c
 	tcc -o bincrc tools/bincrc.c
 
-bin2uf2: tools/bin2uf2
+bin2uf2: tools/bin2uf2.c
 	tcc -o bin2uf2 tools/bin2uf2.c