aboutsummaryrefslogtreecommitdiffstats
path: root/src/rp2040
diff options
context:
space:
mode:
authorKevin O'Connor <kevin@koconnor.net>2024-10-24 19:49:33 -0400
committerKevin O'Connor <kevin@koconnor.net>2024-11-13 14:25:59 -0500
commit9f328cab9536d73df697b325fab13dd7eb550522 (patch)
treed33548de4c6f585ac80b5d5dd3e28860ee404bf0 /src/rp2040
parentc88ee84bed69f2903c7499b380043957b325e28b (diff)
downloadkutter-9f328cab9536d73df697b325fab13dd7eb550522.tar.gz
kutter-9f328cab9536d73df697b325fab13dd7eb550522.tar.xz
kutter-9f328cab9536d73df697b325fab13dd7eb550522.zip
lib: Move lib/rp2040/elf2uf2 to lib/elf2uf2
Recent versions of the rp2040 sdk no longer contain the elf2uf2 tool. So, move that code to a new dedicated directory. This is in preparation for updating the rp2040 sdk version. Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
Diffstat (limited to 'src/rp2040')
-rw-r--r--src/rp2040/Makefile8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/rp2040/Makefile b/src/rp2040/Makefile
index b82503a3..6d1434be 100644
--- a/src/rp2040/Makefile
+++ b/src/rp2040/Makefile
@@ -3,7 +3,7 @@
# Setup the toolchain
CROSS_PREFIX=arm-none-eabi-
-dirs-y += src/rp2040 src/generic lib/rp2040/elf2uf2 lib/fast-hash lib/can2040
+dirs-y += src/rp2040 src/generic lib/elf2uf2 lib/fast-hash lib/can2040
CFLAGS += -mcpu=cortex-m0plus -mthumb -Ilib/cmsis-core
CFLAGS += -Ilib/rp2040 -Ilib/rp2040/cmsis_include -Ilib/fast-hash -Ilib/can2040
@@ -37,13 +37,13 @@ $(OUT)stage2.o: lib/rp2040/boot_stage2/$(STAGE2_FILE) $(OUT)autoconf.h
$(Q)$(CC) $(CFLAGS) -c $(OUT)stage2.S -o $(OUT)stage2.o
# Binary output file rules when using stage2
-$(OUT)lib/rp2040/elf2uf2/elf2uf2: lib/rp2040/elf2uf2/main.cpp
+$(OUT)lib/elf2uf2/elf2uf2: lib/elf2uf2/main.cpp
@echo " Building $@"
$(Q)g++ -g -O -Ilib/rp2040 $< -o $@
-$(OUT)klipper.uf2: $(OUT)klipper.elf $(OUT)lib/rp2040/elf2uf2/elf2uf2
+$(OUT)klipper.uf2: $(OUT)klipper.elf $(OUT)lib/elf2uf2/elf2uf2
@echo " Creating uf2 file $@"
- $(Q)$(OUT)lib/rp2040/elf2uf2/elf2uf2 $< $@
+ $(Q)$(OUT)lib/elf2uf2/elf2uf2 $< $@
rptarget-$(CONFIG_RP2040_HAVE_STAGE2) := $(OUT)klipper.uf2
stage2-$(CONFIG_RP2040_HAVE_STAGE2) := $(OUT)stage2.o